summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-08 13:45:35 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-08 13:45:35 +0000
commit195ebfbef8d4b8c5f9565819b700286b0b4023a2 (patch)
treee7f7999bdd9bf620f62f2f7a1498742fa3aa6cd2 /etc
parent77ff00c85f2a9c6a2b97194fdd2dc84c31dae261 (diff)
downloadmpv-195ebfbef8d4b8c5f9565819b700286b0b4023a2.tar.bz2
mpv-195ebfbef8d4b8c5f9565819b700286b0b4023a2.tar.xz
Add more FourCC values for the Xvid decoder.
patch by Carl Eugen Hoyos, cehoyos ag.or at git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22490 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf15
1 files changed, 14 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index fd025c3c0e..8b467fd3ab 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -633,9 +633,22 @@ videocodec ffwv1f
videocodec xvid
info "XviD (MPEG-4)"
status working
+ fourcc FMP4,fmp4
fourcc DIVX,divx
- fourcc xvid,XVID,XviD
+ fourcc xvid,XVID,XviD,XVIX
+ fourcc DIV1,div1 divx
+ fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+ fourcc M4S2,m4s2
+ fourcc DX50,dx50,BLZ0 DX50
+ fourcc mp4v,MP4V
format 0x4
+ fourcc UMP4
+ fourcc RMP4
+ fourcc 3IV2,3iv2 ; 3ivx Delta 4
+ fourcc DXGM
+ fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
+ fourcc SMP4,smp4 ; Samsung SMP4 video codec
+ format 0x10000004 ; mpeg 4 es
driver xvid
out YV12
out I420