summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
commit95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch)
treeeabf4399e40fd270714c53d40688eadadfd4c5ff /etc
parentf394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff)
parent3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff)
downloadmpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2
mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz
Merge svn changes up to r29532
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf17
1 files changed, 16 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 103955c322..530630beff 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -338,6 +338,14 @@ videocodec ffbmp
dll bmp
out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+videocodec ffdpx
+ info "FFmpeg DPX"
+ status working
+ fourcc "dpx " ; "dpx " is an internal MPlayer FOURCC
+ driver ffmpeg
+ dll dpx
+ out RGB48BE,RGB48LE
+
videocodec ffgif
info "FFmpeg GIF"
status working
@@ -369,7 +377,7 @@ videocodec ffpng
fourcc "png " ; for PNG-encoded QuickTime files
driver ffmpeg
dll png
- out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+ out BGR32,BGR24,BGR8,Y800,RGB48BE,RGB32,RGB24,RGB8
videocodec mpng
info "PNG image"
@@ -3548,6 +3556,13 @@ audiocodec ffmlp
driver ffmpeg
dll "mlp"
+audiocodec fftruehd
+ info "FFmpeg TrueHD"
+ status working
+ fourcc TRHD ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "truehd"
+
audiocodec ffnellymoser
info "FFmpeg Nellymoser Audio"
status working