# HG changeset patch # User cehoyos # Date 1255905799 0 # Node ID 99be640a667224c3058c6c4c42368b639d004258 # Parent 95a0faec021877cd5d2aca17fe014935ce290a92 Support FourCC mjpa as MJPEG. Fixes issue 1492. diff -r 95a0faec0218 -r 99be640a6672 riff.c --- 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 */