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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patched-ffmpeg-mt/libavdevice/vfwcap.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavdevice/oss_audio.c ('k') | patched-ffmpeg-mt/libavfilter/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patched-ffmpeg-mt/libavdevice/vfwcap.c
===================================================================
--- patched-ffmpeg-mt/libavdevice/vfwcap.c (revision 41250)
+++ patched-ffmpeg-mt/libavdevice/vfwcap.c (working copy)
@@ -74,6 +74,9 @@
switch(biCompression) {
case MKTAG('d', 'v', 's', 'd'):
return CODEC_ID_DVVIDEO;
+ case MKTAG('M', 'J', 'P', 'G'):
+ case MKTAG('m', 'j', 'p', 'g'):
+ return CODEC_ID_MJPEG;
}
return CODEC_ID_NONE;
}
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavdevice/oss_audio.c ('k') | patched-ffmpeg-mt/libavfilter/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698