diff options
| author | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 22:16:12 +0000 |
|---|---|---|
| committer | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 22:16:12 +0000 |
| commit | f10aba97c7626e0f1a79280c8e5bc860434e3887 (patch) | |
| tree | 542105e188f982e885a5c9dad94170528ad5da33 /media/media.gyp | |
| parent | 10c7a9fc09c8bc73cafb36631ad47d1d574724b1 (diff) | |
| download | chromium_src-f10aba97c7626e0f1a79280c8e5bc860434e3887.zip chromium_src-f10aba97c7626e0f1a79280c8e5bc860434e3887.tar.gz chromium_src-f10aba97c7626e0f1a79280c8e5bc860434e3887.tar.bz2 | |
merge video_decoder_impl.cc and ffmpeg_video_decoder.cc
Review URL: http://codereview.chromium.org/2854002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp index 39aadd3..f3e57ff 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -121,8 +121,6 @@ 'filters/omx_video_decode_engine.h', 'filters/omx_video_decoder.cc', 'filters/omx_video_decoder.h', - 'filters/video_decoder_impl.cc', - 'filters/video_decoder_impl.h', 'filters/video_decode_engine.h', 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', @@ -211,8 +209,8 @@ 'filters/ffmpeg_demuxer_unittest.cc', 'filters/ffmpeg_glue_unittest.cc', 'filters/ffmpeg_video_decode_engine_unittest.cc', + 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/file_data_source_unittest.cc', - 'filters/video_decoder_impl_unittest.cc', 'filters/video_renderer_base_unittest.cc', 'omx/mock_omx.cc', 'omx/mock_omx.h', |