summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 16:57:25 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 16:57:25 +0300
commitff559b8e90c343eb465400d77fe8881eff09c6e3 (patch)
treef97a23e6945e91be5be86baf2cfc06e0d384e867 /etc
parentd2e25a90c40c47b97becaa6eaefa16e61f7f0cdf (diff)
parentb864ff1b8d73616e2e5bab1e00ef2bdb8fe50278 (diff)
downloadmpv-ff559b8e90c343eb465400d77fe8881eff09c6e3.tar.bz2
mpv-ff559b8e90c343eb465400d77fe8881eff09c6e3.tar.xz
Merge svn changes up to r30907
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf22
1 files changed, 21 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index d52e7c7a3d..2c5a89e44d 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2070,7 +2070,7 @@ videocodec fftheora
format 0xFFFC
driver ffmpeg
dll "theora"
- out YV12
+ out YV12,422P,444P
videocodec vp3
info "On2 Open Source VP3 Codec"
@@ -2753,6 +2753,25 @@ videocodec qtcine
out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
out YV12,YUY2
+videocodec qtaic
+ info "QuickTime AIC video decoder"
+ comment "Mac OS X only"
+ status untested
+ fourcc icod
+ driver qtvideo
+ dll "QuickTime.qts"
+ out UYVY
+
+videocodec qtprores
+ info "Apple ProRes 422 (HQ) decoder"
+ status working
+ fourcc apch
+ fourcc apcn
+ fourcc apcs
+ driver qtvideo
+ dll "AppleProResDecoder.qtx"
+ out YUY2
+
; VSS codecs (http://vsofts.com/solutions.html):
videocodec vsslight
@@ -4447,6 +4466,7 @@ audiocodec speex
status working
comment "Speex driver using libspeex"
fourcc 'spx '
+ format 0xA109
driver speex
dll "speex"