Author: cehoyos Date: Wed Nov 9 00:51:41 2011 New Revision: 34333 Log: Support BMV decoding (bug 2009). Patch by richardpl, onemda gmail Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Nov 8 22:19:39 2011 (r34332) +++ trunk/etc/codecs.conf Wed Nov 9 00:51:41 2011 (r34333) @@ -3488,6 +3488,14 @@ videocodec ffvqa dll "vqavideo" out BGR8 +videocodec ffbmvvideo + info "FFmpeg Discoworld II BMV Video" + status working + fourcc BMVV ; internal MPlayer FourCC + driver ffmpeg + dll bmv_video + out BGR8 + videocodec ffc93 info "FFmpeg C93 Video" status buggy @@ -4285,6 +4293,13 @@ audiocodec ffbinkrdftaud driver ffmpeg dll "binkaudio_rdft" +audiocodec ffbmvaudio + info "FFmpeg Discoworld II BMV Audio" + status working + fourcc BMVA ; internal MPlayer FourCC + driver ffmpeg + dll bmv_audio + audiocodec ffdsicinaudio info "FFmpeg Delphine CIN audio" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Tue Nov 8 22:19:39 2011 (r34332) +++ trunk/libmpdemux/mp_taglists.c Wed Nov 9 00:51:41 2011 (r34333) @@ -37,6 +37,7 @@ static const struct AVCodecTag mp_wav_ta { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { CODEC_ID_BINKAUDIO_DCT, MKTAG('B', 'A', 'U', '1')}, { CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')}, + { CODEC_ID_BMV_AUDIO, MKTAG('B', 'M', 'V', 'A')}, { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, @@ -107,6 +108,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_AVS, MKTAG('A', 'V', 'S', ' ')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, + { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')},