# HG changeset patch
# User compn
# Date 1244896325 0
# Node ID 75b178fa58aab49c9e06574526225ca56f3ee7f3
# Parent  02b664c416bcacc5a4539cdb4508c5dc7222097c
sync with ffmpeg
add m1v1 fourcc to mpeg1 codec
add another format to ima wav adpcm from facebook samples

diff -r 02b664c416bc -r 75b178fa58aa etc/codecs.conf
--- a/etc/codecs.conf	Fri Jun 12 14:23:21 2009 +0000
+++ b/etc/codecs.conf	Sat Jun 13 12:32:05 2009 +0000
@@ -111,7 +111,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
@@ -127,6 +127,7 @@
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc VCR2
   fourcc MPEG
+  fourcc m1v1
   driver ffmpeg
   dll "mpeg1video"
   out YV12,I420,IYUV
@@ -197,7 +198,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo"
@@ -236,7 +237,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver libmpeg2
 ;  dll "libmpeg2"
@@ -273,7 +274,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo_xvmc"
@@ -311,7 +312,7 @@
   fourcc AVmp
   fourcc mp2v,mpgv
   fourcc LMP2 ; Lead mpeg2 in avi
-  fourcc m2v1
+  fourcc m2v1,m1v1
   driver ffmpeg
   dll "mpegvideo_vdpau"
   out VDPAU_MPEG1
@@ -3286,6 +3287,7 @@
   status working
   format 0x11
   format 0x1100736d ; "ms\x00\x11" (MOV files)
+  format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov
   driver ffmpeg
   dll adpcm_ima_wav