diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 01:49:32 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 01:49:32 +0000 |
| commit | a651b74d09d8f96d6dbb488dde3c494d97544886 (patch) | |
| tree | 30c6280d152e13b42e38d1ceed96759ce65db15b /media/media.gyp | |
| parent | 673590a92d94c9fac62a3984f31e89461bde5054 (diff) | |
| download | chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.zip chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.tar.gz chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.tar.bz2 | |
Refactor some code that depends on FFmpeg
Some FFmpeg header and source files are misplaced:
media/filters/ffmpeg_common.{cc, h} -> media/ffmpeg
media/tools/media_bench/file_protocol.{cc, h} -> media/ffmpeg
And the necessary refactoring for the new location is done.
Review URL: http://codereview.chromium.org/555087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/media.gyp b/media/media.gyp index 07d5271..af218a1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -87,8 +87,12 @@ 'base/yuv_row_mac.cc', 'base/yuv_row_linux.cc', 'base/yuv_row.h', + 'ffmpeg/ffmpeg_common.cc', + 'ffmpeg/ffmpeg_common.h', 'ffmpeg/ffmpeg_util.cc', 'ffmpeg/ffmpeg_util.h', + 'ffmpeg/file_protocol.cc', + 'ffmpeg/file_protocol.h', 'filters/audio_renderer_algorithm_base.cc', 'filters/audio_renderer_algorithm_base.h', 'filters/audio_renderer_algorithm_default.cc', @@ -104,8 +108,6 @@ 'filters/decoder_base.h', 'filters/ffmpeg_audio_decoder.cc', 'filters/ffmpeg_audio_decoder.h', - 'filters/ffmpeg_common.cc', - 'filters/ffmpeg_common.h', 'filters/ffmpeg_demuxer.cc', 'filters/ffmpeg_demuxer.h', 'filters/ffmpeg_glue.cc', @@ -243,8 +245,6 @@ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'sources': [ - 'tools/media_bench/file_protocol.cc', - 'tools/media_bench/file_protocol.h', 'tools/media_bench/media_bench.cc', ], }, @@ -273,7 +273,7 @@ '../base/base.gyp:base', ], 'sources': [ - 'omx/omx_test.cc', + 'tools/omx_test/omx_test.cc', ], }, { |