Author: cehoyos Date: Fri Nov 4 09:41:11 2011 New Revision: 34295 Log: Support Mobotix MxPEG decoding (bug 2004). Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Nov 3 20:33:05 2011 (r34294) +++ trunk/etc/codecs.conf Fri Nov 4 09:41:11 2011 (r34295) @@ -2713,6 +2713,14 @@ videocodec ffamv dll "amv" out YV12 +videocodec ffmxpeg + info "FFmpeg MxPEG" + status working + fourcc MXPG ; internal MPlayer FourCC + driver ffmpeg + dll mxpeg + out YV12 + videocodec ffsp5x info "SP5x codec - used by Aiptek MegaCam" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Thu Nov 3 20:33:05 2011 (r34294) +++ trunk/libmpdemux/mp_taglists.c Fri Nov 4 09:41:11 2011 (r34295) @@ -118,6 +118,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, + { CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G')}, { CODEC_ID_NUV, MKTAG('R', 'J', 'P', 'G')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},