aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Littler <tempn@twmi.rr.com>2009-01-08 18:00:51 +0000
committerBen Littler <tempn@twmi.rr.com>2009-01-08 18:00:51 +0000
commit54f8abde9336b5c326fc4bdfeeef2e19bb03436a (patch)
tree579fa39e622e73643d1d197bf9e80a360d24cf16
parent949462b32ea273e80d701924765d0494a7ad199c (diff)
downloadffmpeg-54f8abde9336b5c326fc4bdfeeef2e19bb03436a.tar.gz
cosmetics: CJPG is from Creative Webcam
Originally committed as revision 16497 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/riff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index dd08dfcbac..0f9b177c67 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -117,7 +117,7 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
{ CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
{ CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
- { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') },
+ { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
{ CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },