Mercurial > mplayer.hg
changeset 29613:7386b883fba6
Add support for lavf vqf demuxer and lavc TwinVQ decoder.
Also make lavf the default demuxer for vqf.
Ok'ed by Compn on IRC.
| author | vitor |
|---|---|
| date | Mon, 07 Sep 2009 17:20:44 +0000 |
| parents | 01b933e5d04c |
| children | 1e19b831575b |
| files | etc/codecs.conf libmpdemux/demux_lavf.c libmpdemux/extension.c libmpdemux/mp_taglists.c |
| diffstat | 4 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Mon Sep 07 16:29:32 2009 +0000 +++ b/etc/codecs.conf Mon Sep 07 17:20:44 2009 +0000 @@ -4105,6 +4105,14 @@ driver acm dll "smcelp32.acm" +audiocodec fftwinvq + info "FFmpeg TwinVQ" + status working + fourcc TWI2 ; internal MPlayer FourCC, different from mplayer's TwinVQ decoder + ; since lavf demuxer is incompatible with it + driver ffmpeg + dll twinvq + audiocodec TwinVQ info "VQF codec by NTTLabs" status working
--- a/libmpdemux/demux_lavf.c Mon Sep 07 16:29:32 2009 +0000 +++ b/libmpdemux/demux_lavf.c Mon Sep 07 17:20:44 2009 +0000 @@ -183,6 +183,7 @@ "mov,mp4,m4a,3gp,3g2,mj2", "mpc", "mpc8", + "vqf", NULL };
--- a/libmpdemux/extension.c Mon Sep 07 16:29:32 2009 +0000 +++ b/libmpdemux/extension.c Mon Sep 07 17:20:44 2009 +0000 @@ -65,7 +65,7 @@ { "it", DEMUXER_TYPE_XMMS }, { "mid", DEMUXER_TYPE_XMMS }, { "midi", DEMUXER_TYPE_XMMS }, - { "vqf", DEMUXER_TYPE_XMMS }, + { "vqf", DEMUXER_TYPE_LAVF }, { "nsv", DEMUXER_TYPE_NSV }, { "nsa", DEMUXER_TYPE_NSV }, { "mpc", DEMUXER_TYPE_MPC },
--- a/libmpdemux/mp_taglists.c Mon Sep 07 16:29:32 2009 +0000 +++ b/libmpdemux/mp_taglists.c Mon Sep 07 17:20:44 2009 +0000 @@ -46,6 +46,7 @@ { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')}, { CODEC_ID_TRUEHD, MKTAG('T', 'R', 'H', 'D')}, { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, + { CODEC_ID_TWINVQ, MKTAG('T', 'W', 'I', '2')}, { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')}, { CODEC_ID_XAN_DPCM, MKTAG('A', 'x', 'a', 'n')},