media/media.gyp - Issue 16274005: Separate DemuxerStream and VideoDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

Issue 16274005: Separate DemuxerStream and VideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win64 Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 88b28dcefbccdbebbb85fa7f5b321095660ed21e..1a848f9abc5dee2cf8792d8f34a0ce89fe19f6cd 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',

« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | no next file » | no next file with comments »