summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-07 15:17:06 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-07 15:17:06 +0000
commit4549fd116410e7cbc0e14120dfee0e4b99a34e66 (patch)
tree0663b966e5f3fa6a5510f3e18acad8e7fb6ade42 /etc
parent916a1d5dea518a04805cf18bc45c4efaadbea22a (diff)
downloadmpv-4549fd116410e7cbc0e14120dfee0e4b99a34e66.tar.bz2
mpv-4549fd116410e7cbc0e14120dfee0e4b99a34e66.tar.xz
ffodivx m4s2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6011 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 0ce097f454..addd5e1323 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -214,7 +214,7 @@ videocodec ffmp42
info "FFmpeg M$ MPEG-4 v2"
status working
fourcc DIV2,div2 mp42
- fourcc MP42 mp42
+ fourcc MP42,mp42
driver ffmpeg
dll msmpeg4v2
out YV12,I420,IYUV
@@ -225,6 +225,7 @@ videocodec ffodivx
fourcc DIVX,divx
fourcc DIV1,div1 divx
fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+ fourcc M4S2,m4s2
fourcc xvid,XVID,XviD
fourcc DX50
fourcc mp4v