summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-04 19:49:35 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-04 19:49:35 +0300
commit0e1b7765be878491565cf5e471f22b15e106164c (patch)
tree422e500c289335182a2a64934dcabf10b95e32dc /etc
parenta9618c1c6fe9424dfaeb1677348e0382d7252554 (diff)
parentdcfd043ea8d0c46929aad78596314d837c290d39 (diff)
downloadmpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2
mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz
Merge svn changes up to r29644
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf20
1 files changed, 18 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 530630beff..fd9a484c09 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -874,7 +874,6 @@ videocodec ffh264
fourcc X264,x264
fourcc avc1,AVC1
fourcc davc,DAVC
- fourcc HDMV
format 0x10000005
driver ffmpeg
dll h264
@@ -887,7 +886,6 @@ videocodec ffh264vdpau
fourcc X264,x264
fourcc avc1,AVC1
fourcc davc,DAVC
- fourcc HDMV
format 0x10000005
driver ffmpeg
dll h264_vdpau
@@ -3654,6 +3652,14 @@ audiocodec ffwmav2
driver ffmpeg
dll "wmav2"
+audiocodec ffwmapro
+ info "WMA Pro audio (FFmpeg)"
+ status untested
+ format 0x162
+ fourcc "WMA3"
+ driver ffmpeg
+ dll "wmapro"
+
audiocodec ffmac3
info "Macintosh Audio Compression and Expansion 3:1"
status untested
@@ -3786,6 +3792,13 @@ audiocodec dvdpcm
format 0x10001
driver dvdpcm
+audiocodec lpcm
+ info "Bluray LPCM"
+ status working
+ fourcc BPCM ; internal MPlayer FourCC
+ driver ffmpeg
+ dll pcm_bluray
+
audiocodec a52
info "AC3-liba52"
status working
@@ -3800,6 +3813,7 @@ audiocodec ffac3
status working
format 0x2000
format 0x332D6361 ; ac-3 in mp4
+ format 0x332D4341
fourcc dnet
fourcc sac3
driver ffmpeg
@@ -3816,12 +3830,14 @@ audiocodec dts
info "DTS-libdca"
status working
format 0x2001
+ format 0x86
driver libdca
audiocodec ffdca
info "FFmpeg DTS"
status working
format 0x2001
+ format 0x86
driver ffmpeg
dll "dca"