diff options
| author | vitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-07 17:20:44 +0000 |
|---|---|---|
| committer | vitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-07 17:20:44 +0000 |
| commit | 9d99f5bd8d8fdeb3997d14a2cea3f32d928b9d22 (patch) | |
| tree | 5c2930ecdce1d3180732587e051539a076dc2257 | |
| parent | af8ff1be74077b6a7a2d426923cd312d0ec6d4c0 (diff) | |
| download | mpv-9d99f5bd8d8fdeb3997d14a2cea3f32d928b9d22.tar.bz2 mpv-9d99f5bd8d8fdeb3997d14a2cea3f32d928b9d22.tar.xz | |
Add support for lavf vqf demuxer and lavc TwinVQ decoder.
Also make lavf the default demuxer for vqf.
Ok'ed by Compn on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 | ||||
| -rw-r--r-- | libmpdemux/extension.c | 2 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0530bef1b0..2aade33cf3 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4105,6 +4105,14 @@ audiocodec pscelp 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 diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index e89b3914f0..a4f84eda71 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -183,6 +183,7 @@ static const char * const preferred_list[] = { "mov,mp4,m4a,3gp,3g2,mj2", "mpc", "mpc8", + "vqf", NULL }; diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index dc20214b87..e81c09e156 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -65,7 +65,7 @@ static struct { { "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 }, diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 99f506fbdf..5cea53c2ec 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -46,6 +46,7 @@ static const AVCodecTag mp_wav_tags[] = { { 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')}, |