[MPlayer-cvslog] r29359 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Sat Jun 13 14:32:05 2009
New Revision: 29359

Log:
sync with ffmpeg
add m1v1 fourcc to mpeg1 codec
add another format to ima wav adpcm from facebook samples

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Jun 12 16:23:21 2009	(r29358)
+++ trunk/etc/codecs.conf	Sat Jun 13 14:32:05 2009	(r29359)
@@ -111,7 +111,7 @@ videocodec mpegpes
   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 @@ videocodec ffmpeg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc VCR2
   fourcc MPEG
+  fourcc m1v1
   driver ffmpeg
   dll "mpeg1video"
   out YV12,I420,IYUV
@@ -197,7 +198,7 @@ videocodec ffmpeg12
   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 @@ videocodec mpeg12
   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 @@ videocodec ffmpeg12mc
   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 @@ videocodec ffmpeg12vdpau
   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 @@ audiocodec ffadpcmimawav
   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