aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNash Tsai <nash.tsai@gmail.com>2010-02-23 16:49:16 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2010-02-23 16:49:16 +0000
commitd7a4961e5353ff983bd7b53acf56ab8076dfaeba (patch)
tree02939c55e70ef1fc26abb0b0a4c54e13c70b5dc6
parentf1d5a1f285a479675727914d32095d57bc210668 (diff)
downloadffmpeg-d7a4961e5353ff983bd7b53acf56ab8076dfaeba.tar.gz
vfwcap: support MJPG compressed streams.
Patch by Nash Tsai <nash dot tsai at gmail dot com> Originally committed as revision 22004 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavdevice/vfwcap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 4d07664094..bd7290fe96 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -74,6 +74,9 @@ static enum CodecID vfw_codecid(DWORD biCompression)
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;
}