Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(938)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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:
View side-by-side diff with in-line comments
Download patch
« media/base/test_data_util.h ('K') | « media/base/test_data_util.cc ('k') | media/filters/bitstream_converter.h » ('j') | media/filters/bitstream_converter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« media/base/test_data_util.h ('K') | « media/base/test_data_util.cc ('k') | media/filters/bitstream_converter.h » ('j') | media/filters/bitstream_converter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698