media/media.gyp - Issue 2854002: merge video_decoder_impl.cc and ffmpeg_video_decoder.cc

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 2854002: merge video_decoder_impl.cc and ffmpeg_video_decoder.cc (Closed)

Patch Set: remove comments Created 10 years, 6 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:

Index: media/media.gyp

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

index 39aadd3fa70baeeb697004b9e191fda4acfea1d3..f3e57fffc876240097cea676296d4fa619a381d1 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',

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