# HG changeset patch
# User cehoyos
# Date 1320796301 0
# Node ID 3498659ef543138960ee0405314524fe83204a8f
# Parent  07aabc1bb1fdb8f044f758fb942e10bb7b83b1d8
Support BMV decoding (bug 2009).

Patch by richardpl, onemda gmail

diff -r 07aabc1bb1fd -r 3498659ef543 etc/codecs.conf
--- a/etc/codecs.conf	Tue Nov 08 21:19:39 2011 +0000
+++ b/etc/codecs.conf	Tue Nov 08 23:51:41 2011 +0000
@@ -3488,6 +3488,14 @@
   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 @@
   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
diff -r 07aabc1bb1fd -r 3498659ef543 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Tue Nov 08 21:19:39 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Nov 08 23:51:41 2011 +0000
@@ -37,6 +37,7 @@
     { 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 @@
     { 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')},