Refactor some code that depends on FFmpeg

media/filters/bitstream_converter_unittest.cc

Index: media/filters/bitstream_converter_unittest.cc
diff --git a/media/filters/bitstream_converter_unittest.cc b/media/filters/bitstream_converter_unittest.cc
index 007becbaa329cfb246067cc5a7bb9281195653f5..85ca34e6f8800ed7804bf59b2bddf3ac6f23577e 100644
--- a/media/filters/bitstream_converter_unittest.cc
+++ b/media/filters/bitstream_converter_unittest.cc
@@ -1,12 +1,12 @@
-// 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 <deque>
 
 #include "media/base/mock_ffmpeg.h"
+#include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/bitstream_converter.h"
-#include "media/filters/ffmpeg_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::DoAll;