Mercurial > libavformat.hg
diff riff.c @ 5307:99be640a6672 libavformat
Support FourCC mjpa as MJPEG.
Fixes issue 1492.
author | cehoyos |
---|---|
date | Sun, 18 Oct 2009 22:43:19 +0000 |
parents | 0d5653941bf9 |
children | 653730591c20 |
line wrap: on
line diff
--- a/riff.c Sun Oct 18 21:41:03 2009 +0000 +++ b/riff.c Sun Oct 18 22:43:19 2009 +0000 @@ -119,6 +119,7 @@ { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */