diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
commit | 4ebf0075806ccf2bdde276a4e56eac41c7e350c4 (patch) | |
tree | 89b4572543527808c92f4e37448bca4012e926ad /etc | |
parent | efd25f7811b232ae2b1899ca0fee6fd598837b9f (diff) | |
parent | c2ba58aefce038ce4ccf6ed23791f5de823aa041 (diff) | |
download | mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.bz2 mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.xz |
Merge svn changes up to r30375
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 407696451b..04662dd90d 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -984,6 +984,7 @@ videocodec ffodivx fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC fourcc EPHV,SN40 + fourcc uldx,ULDX,VSPX driver ffmpeg dll mpeg4 ;opendivx out YV12,I420,IYUV @@ -1015,6 +1016,7 @@ videocodec ffodivxvdpau fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC fourcc EPHV,SN40 + fourcc uldx,ULDX,VSPX driver ffmpeg dll mpeg4_vdpau out VDPAU_MPEG4 @@ -1066,6 +1068,7 @@ videocodec xvid fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC fourcc EPHV,SN40 + fourcc uldx,ULDX,VSPX format 0x10000004 ; mpeg 4 es driver xvid out YV12 |