[MPlayer-cvslog] r30679 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[kostya]

Author: kostya
Date: Sun Feb 21 14:38:55 2010
New Revision: 30679

Log:
FFmpeg supports Bink, let MPlayer play it as well

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sun Feb 21 13:48:56 2010	(r30678)
+++ trunk/etc/codecs.conf	Sun Feb 21 14:38:55 2010	(r30679)
@@ -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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sun Feb 21 13:48:56 2010	(r30678)
+++ trunk/libmpdemux/mp_taglists.c	Sun Feb 21 14:38:55 2010	(r30679)
@@ -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')},