# HG changeset patch
# User kostya
# Date 1266759535 0
# Node ID 0947ead7e81b6091fe8959cb5a5cb8a4dd1d20b1
# Parent  93379281129de31c6a600b8e642d0f8cca0baa95
FFmpeg supports Bink, let MPlayer play it as well

diff -r 93379281129d -r 0947ead7e81b etc/codecs.conf
--- a/etc/codecs.conf	Sun Feb 21 12:48:56 2010 +0000
+++ b/etc/codecs.conf	Sun Feb 21 13:38:55 2010 +0000
@@ -9,6 +9,17 @@
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffbinkvideo
+  info "FFmpeg Bink Video"
+  status working
+  fourcc BIKf ; internal MPlayer FourCC
+  fourcc BIKg ; internal MPlayer FourCC
+  fourcc BIKh ; internal MPlayer FourCC
+  fourcc BIKi ; internal MPlayer FourCC
+  driver ffmpeg
+  dll binkvideo
+  out YV12
+
 videocodec ffcdgraphics
   info "FFmpeg CD-Graphics"
   status working
@@ -3756,6 +3767,20 @@
   driver ffmpeg
   dll "smackaud"
 
+audiocodec ffbinkdctaud
+  info "FFmpeg Bink Audio (DCT)"
+  status buggy
+  fourcc BAU1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "binkaudio_dct"
+
+audiocodec ffbinkrdftaud
+  info "FFmpeg Bink Audio (RDFT)"
+  status working
+  fourcc BAU2 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "binkaudio_rdft"
+
 audiocodec ffdsicinaudio
   info "FFmpeg Delphine CIN audio"
   status working
diff -r 93379281129d -r 0947ead7e81b libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Sun Feb 21 12:48:56 2010 +0000
+++ b/libmpdemux/mp_taglists.c	Sun Feb 21 13:38:55 2010 +0000
@@ -30,6 +30,8 @@
     { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
     { CODEC_ID_ADPCM_XA,          MKTAG('P', 'S', 'X', 'A')},
     { 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_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},