summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 19:55:25 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 19:55:25 +0000
commit04db08e9188faf366d9422abede62612aad97289 (patch)
treea2886b7126e5f3a4e42eccb22bdfc1dfd503aa9e /etc
parent584cefe84f7515ae0acfdf0dd95855975910aff5 (diff)
downloadmpv-04db08e9188faf366d9422abede62612aad97289.tar.bz2
mpv-04db08e9188faf366d9422abede62612aad97289.tar.xz
sync with xine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27643 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index c89999fff4..105bcda634 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -728,6 +728,7 @@ videocodec ffvc1
info "FFmpeg WVC1"
status buggy
fourcc WVC1,wvc1,WMVA
+ fourcc vc-1,VC-1
driver ffmpeg
dll vc1
out YV12,I420,IYUV
@@ -3029,6 +3030,7 @@ audiocodec ffaac
fourcc "VLB " ; Used in NSV, not really working
fourcc "AAC " ; Used in NSV
fourcc "AACP" ; Used in NSV for AACPlus
+ fourcc raac,racp
format 0xff
format 0x706D
driver ffmpeg