Mercurial > mplayer.hg
changeset 35141:ef73eb8a2c43
Support FFmpeg's TAK decoder.
Patch by Xidorn Quan, quanxunzhen gmail
| author | cehoyos |
|---|---|
| date | Mon, 08 Oct 2012 11:36:22 +0000 |
| parents | 4d6fba26c46f |
| children | 1accad685563 |
| files | etc/codecs.conf libmpdemux/extension.c libmpdemux/mp_taglists.c |
| diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Sun Oct 07 19:15:16 2012 +0000 +++ b/etc/codecs.conf Mon Oct 08 11:36:22 2012 +0000 @@ -5840,3 +5840,10 @@ driver ffmpeg dll "wavesynth" +audiocodec fftak + info "FFmpeg TAK" + status working + fourcc "TAK " ; internal MPlayer FourCC + driver ffmpeg + dll "tak" +
--- a/libmpdemux/extension.c Sun Oct 07 19:15:16 2012 +0000 +++ b/libmpdemux/extension.c Mon Oct 08 11:36:22 2012 +0000 @@ -84,6 +84,7 @@ { "mac", DEMUXER_TYPE_LAVF }, { "str", DEMUXER_TYPE_LAVF }, { "cdg", DEMUXER_TYPE_LAVF }, + { "tak", DEMUXER_TYPE_LAVF }, // At least the following are hacks against broken autodetection // that should not be there
--- a/libmpdemux/mp_taglists.c Sun Oct 07 19:15:16 2012 +0000 +++ b/libmpdemux/mp_taglists.c Mon Oct 08 11:36:22 2012 +0000 @@ -69,6 +69,7 @@ { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')}, { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')}, + { AV_CODEC_ID_TAK, MKTAG('T', 'A', 'K', ' ')}, { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, { CODEC_ID_TWINVQ, MKTAG('T', 'W', 'I', '2')}, #if LIBAVUTIL_VERSION_MICRO >= 100