Refactor some code that depends on FFmpeg

media/filters/video_decoder_impl.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/video_decoder_impl.h"
 
 #include "base/task.h"
 #include "media/base/filters.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame_impl.h"
-#include "media/filters/ffmpeg_common.h"
+#include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_interfaces.h"
 #include "media/filters/video_decode_engine.h"
 #include "media/ffmpeg/ffmpeg_util.h"
 
 namespace media {
 
 VideoDecoderImpl::VideoDecoderImpl(VideoDecodeEngine* engine)
     : width_(0),
       height_(0),
       time_base_(new AVRational()),
@@ skipping 286 matching lines @@
   host()->SetError(PIPELINE_ERROR_DECODE);
   state_ = kDecodeFinished;
 }
 
 void VideoDecoderImpl::SetVideoDecodeEngineForTest(
     VideoDecodeEngine* engine) {
   decode_engine_.reset(engine);
 }
 
 }  // namespace media