From 88f86bcc4d1863fdbbe0843229e1e97db61f0850 Mon Sep 17 00:00:00 2001
From: kostya <kostya@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 21 Feb 2010 13:38:55 +0000
Subject: FFmpeg supports Bink, let MPlayer play it as well

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30679 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf          | 25 +++++++++++++++++++++++++
 libmpdemux/mp_taglists.c |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index af8d946ea0..23d4f50a97 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -9,6 +9,17 @@ release 20090308
 ;                   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 @@ audiocodec ffsmkaud
   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 --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 3b280fe53f..588df00af1 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -30,6 +30,8 @@ static const AVCodecTag mp_wav_tags[] = {
     { 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')},
-- 
cgit v1.2.3