summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf25
-rw-r--r--libmpdemux/mp_taglists.c2
2 files changed, 27 insertions, 0 deletions
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')},