summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-17 14:21:07 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-17 14:21:07 +0000
commit50e52496aa1399648b696e80aefcec1c8c0a7da4 (patch)
tree78faeb0e3dde1aef17a2b40b3d4a3b85bd235fac /etc
parent454dcc769012be3776e25302383a8c9eb08dc28b (diff)
downloadmpv-50e52496aa1399648b696e80aefcec1c8c0a7da4.tar.bz2
mpv-50e52496aa1399648b696e80aefcec1c8c0a7da4.tar.xz
Mp4S fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5162 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 993b3414a1..c6d5354baf 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -71,6 +71,7 @@ videocodec mpeg4ds
status working
comment "with postprocessing"
fourcc DIV2,div2 mp42
+ fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
fourcc MPG4,mpg4
fourcc MP42,mp42
driver dshow
@@ -112,7 +113,7 @@ videocodec odivx
status working
fourcc DIVX,divx
fourcc DIV1,div1 divx
- fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
fourcc AP41 DIV3 ; AngelPotion stuff
fourcc xvid,XVID,XviD
@@ -128,7 +129,7 @@ videocodec divx4
status working
fourcc DIVX,divx
fourcc DIV1,div1 divx
- fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
fourcc AP41 DIV3 ; AngelPotion stuff
fourcc xvid,XVID,XviD
@@ -148,7 +149,7 @@ videocodec divx4vfw
comment "with postprocessing!!!"
fourcc DIVX,divx ; opendivx / divx4
fourcc DIV1,div1 divx
- fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
fourcc AP41 DIV3 ; AngelPotion stuff
format 0x4