diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 09:45:25 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 09:45:25 +0000 |
| commit | 57b44c9239e672bbc6cb698b66a7809383222c04 (patch) | |
| tree | 04655d8bc7072c4b25360e518708c83f77bc3aae /media/media.gyp | |
| parent | f101378f9d28d49f50b42e8004f2e8385e43c094 (diff) | |
| download | chromium_src-57b44c9239e672bbc6cb698b66a7809383222c04.zip chromium_src-57b44c9239e672bbc6cb698b66a7809383222c04.tar.gz chromium_src-57b44c9239e672bbc6cb698b66a7809383222c04.tar.bz2 | |
Reland r210741 "Separate DemuxerStream and VideoDecoder."
The original CL r210741 was reverted by r210765 due to a test failure. This CL relands r210741 with the fix.
BUG=141788
Review URL: https://chromiumcodereview.appspot.com/18414008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211559 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 e8d72ed..e59743ee 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -233,7 +233,6 @@ 'base/buffers.h', 'base/byte_queue.cc', 'base/byte_queue.h', - 'base/callback_holder.h', 'base/channel_mixer.cc', 'base/channel_mixer.h', 'base/clock.cc', @@ -337,10 +336,6 @@ 'filters/decrypting_demuxer_stream.h', 'filters/decrypting_video_decoder.cc', 'filters/decrypting_video_decoder.h', - 'filters/fake_demuxer_stream.cc', - 'filters/fake_demuxer_stream.h', - 'filters/fake_video_decoder.cc', - 'filters/fake_video_decoder.h', 'filters/ffmpeg_audio_decoder.cc', 'filters/ffmpeg_audio_decoder.h', 'filters/ffmpeg_demuxer.cc', @@ -923,6 +918,7 @@ 'base/audio_timestamp_helper_unittest.cc', 'base/bind_to_loop_unittest.cc', 'base/bit_reader_unittest.cc', + 'base/callback_holder.h', 'base/callback_holder_unittest.cc', 'base/channel_mixer_unittest.cc', 'base/clock_unittest.cc', @@ -957,7 +953,11 @@ 'filters/decrypting_audio_decoder_unittest.cc', 'filters/decrypting_demuxer_stream_unittest.cc', 'filters/decrypting_video_decoder_unittest.cc', + 'filters/fake_demuxer_stream.cc', + 'filters/fake_demuxer_stream.h', 'filters/fake_demuxer_stream_unittest.cc', + 'filters/fake_video_decoder.cc', + 'filters/fake_video_decoder.h', 'filters/fake_video_decoder_unittest.cc', 'filters/ffmpeg_audio_decoder_unittest.cc', 'filters/ffmpeg_demuxer_unittest.cc', |