summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:05:30 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:05:30 +0200
commit231b33a02fae95b260120349040106bfa34a3750 (patch)
tree23c4de0e6263b2d99966348d7003177b3b3e3740 /etc
parent52126e574c7872ca95e7974cfe5445421b74f24c (diff)
parent92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b (diff)
downloadmpv-231b33a02fae95b260120349040106bfa34a3750.tar.bz2
mpv-231b33a02fae95b260120349040106bfa34a3750.tar.xz
Merge svn changes up to r30165
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf51
1 files changed, 35 insertions, 16 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5f22c31a2d..be548cac61 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1305,6 +1305,7 @@ videocodec ffmjpeg
dll mjpeg
out 444P
out 422P
+ out 440P
out YUY2 ; queried (conversion from yuv422p)
out YV12,I420,IYUV
out BGR32 ; lossless JPEG
@@ -1319,6 +1320,7 @@ videocodec ffmjpegb
dll mjpegb
out 444P
out 422P
+ out 440P
out YUY2 ; queryed (conversion from yuv422p)
out YV12,I420,IYUV
@@ -2058,7 +2060,7 @@ videocodec ffvp6a
fourcc VP6A
driver ffmpeg
dll "vp6a"
- out I420,YUY2,YV12
+ out 420A
videocodec ffvp6f
info "FFmpeg VP6 Flash"
@@ -2237,6 +2239,15 @@ videocodec tm20
guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
out BGR32,BGR24,BGR16 flip
+videocodec tm2xvfw
+ info "TrueMotion 2.0"
+ status working
+ fourcc TM2X
+ fourcc TM2A TM2X
+ driver vfw
+ dll "tm2X.dll"
+ out BGR32,BGR24,BGR16 flip
+
videocodec tr20
info "TrueMotion RT"
status working
@@ -2627,6 +2638,14 @@ videocodec qtsvq1
dll "QuickTime.qts"
out YVU9
+videocodec ffv210
+ info "FFmpeg V210 - 10-bit"
+ status untested
+ fourcc v210
+ driver ffmpeg
+ dll v210
+ out 422P16
+
videocodec qtcine
info "cinewave uncompressed 10-bit codec"
status working
@@ -3769,7 +3788,7 @@ audiocodec ffaac
audiocodec ffflac
info "FFmpeg FLAC audio"
status working
- format 0x43614C66
+ fourcc "fLaC"
format 0xF1AC
driver ffmpeg
dll "flac"
@@ -4063,15 +4082,6 @@ audiocodec lpcm
driver ffmpeg
dll pcm_bluray
-audiocodec a52
- info "AC3-liba52"
- status working
- format 0x2000
- ; format 0x332D6361 ; ac-3 in mp4 -- not working
- fourcc dnet
- driver liba52
- dll "liba52"
-
audiocodec ffac3
info "FFmpeg AC-3"
status working
@@ -4091,12 +4101,14 @@ audiocodec ffeac3
driver ffmpeg
dll eac3
-audiocodec dts
- info "DTS-libdca"
+audiocodec a52
+ info "AC3-liba52"
status working
- format 0x2001
- format 0x86
- driver libdca
+ format 0x2000
+ ; format 0x332D6361 ; ac-3 in mp4 -- not working
+ fourcc dnet
+ driver liba52
+ dll "liba52"
audiocodec ffdca
info "FFmpeg DTS"
@@ -4106,6 +4118,13 @@ audiocodec ffdca
driver ffmpeg
dll "dca"
+audiocodec dts
+ info "DTS-libdca"
+ status working
+ format 0x2001
+ format 0x86
+ driver libdca
+
audiocodec ffmusepack7
info "Musepack sv7 audio codec"
comment "only works with libavformat demuxer"