summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorvitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-07 17:20:44 +0000
committervitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-07 17:20:44 +0000
commit9d99f5bd8d8fdeb3997d14a2cea3f32d928b9d22 (patch)
tree5c2930ecdce1d3180732587e051539a076dc2257 /etc
parentaf8ff1be74077b6a7a2d426923cd312d0ec6d4c0 (diff)
downloadmpv-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
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf8
1 files changed, 8 insertions, 0 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