diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2009-01-13 17:10:10 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2009-01-13 17:10:10 +0000 |
| commit | ed0879eda95c3cdce861216f82f6a3f0bae6d042 (patch) | |
| tree | 44e91ea74bba180e9701860808a5f15cd65e0d53 /libavformat/riff.c | |
| parent | 7a96cd31232bec71bbc4d8931b9d52b5748b3f9e (diff) | |
| download | ffmpeg-ed0879eda95c3cdce861216f82f6a3f0bae6d042.tar.gz | |
add SLMJ fourcc to mjpeg
Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 0f9b177c67..ed7d9a5f22 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -117,6 +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('S', 'L', 'M', 'J') }, /* SL M-JPEG */ { 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') }, |