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

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 7658017: Revert 96974 - 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
« no previous file with comments | « media/base/test_data_util.cc ('k') | media/filters/bitstream_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
===================================================================
--- media/ffmpeg/ffmpeg_common.cc (revision 96976)
+++ media/ffmpeg/ffmpeg_common.cc (working copy)
@@ -43,8 +43,6 @@
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/test_data_util.cc ('k') | media/filters/bitstream_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698