media/ffmpeg/ffmpeg_common.cc - Issue 7587012: Remove mock_ffmpeg and update media unittests.

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/ffmpeg/ffmpeg_common.cc

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Disable DecodeFrame_LargerXXX tests to make Valgrind happy. Created 9 years, 4 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/ffmpeg/ffmpeg_common.cc

diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc

index 0be30ed52ca21f4b0b1e34e8099ddf86e24f6f4f..d03715e0bfff4bbc02457b6ed585cfc34d025dba 100644

--- a/media/ffmpeg/ffmpeg_common.cc

+++ b/media/ffmpeg/ffmpeg_common.cc

@@ -43,6 +43,8 @@ VideoCodec CodecIDToVideoCodec(CodecID codec_id) {

CodecID VideoCodecToCodecID(VideoCodec video_codec) {

switch (video_codec) {

+ case kUnknown:

+ return CODEC_ID_NONE;

case kCodecVC1:

return CODEC_ID_VC1;

case kCodecH264:

« no previous file with comments | « media/base/video_decoder_config.cc ('k') | media/filters/bitstream_converter.h » ('j') | no next file with comments »