# HG changeset patch
# User michael
# Date 1020784626 0
# Node ID 3b9e278d23d2d2ccb89d5ce901d7b9a437867d59
# Parent  bb1f3552f11821321582ff8689913feaa682a179
ffodivx m4s2

diff -r bb1f3552f118 -r 3b9e278d23d2 etc/codecs.conf
--- a/etc/codecs.conf	Tue May 07 13:31:29 2002 +0000
+++ b/etc/codecs.conf	Tue May 07 15:17:06 2002 +0000
@@ -214,7 +214,7 @@
   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 @@
   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