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

cehoyos subversion at mplayerhq.hu
Wed Nov 9 01:32:12 CET 2011


Author: cehoyos
Date: Wed Nov  9 01:32:12 2011
New Revision: 34334

Log:
Fix "m1v " playback.

It seems the codecs.conf parser does not accept fourcc's with spaces
after other fourcc's.

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Nov  9 00:51:41 2011	(r34333)
+++ trunk/etc/codecs.conf	Wed Nov  9 01:32:12 2011	(r34334)
@@ -213,7 +213,8 @@ videocodec ffmpeg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc VCR2
   fourcc MPEG
-  fourcc m1v1,"m1v "
+  fourcc m1v1
+  fourcc "m1v "
   driver ffmpeg
   dll "mpeg1video"
   out YV12,I420,IYUV
@@ -289,7 +290,8 @@ videocodec ffmpeg12
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1,m1v1,"m1v "
+  fourcc m2v1,m1v1
+  fourcc "m1v "
   fourcc LMP2 ; Lead mpeg2 in avi
   fourcc slif ; SoftLab MPEG-2 I-frames Codec
   fourcc EM2V ; Etymonix MPEG-2 I-frame Video Codec
@@ -331,7 +333,8 @@ videocodec mpeg12
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1,m1v1,"m1v "
+  fourcc m2v1,m1v1
+  fourcc "m1v "
   fourcc LMP2 ; Lead mpeg2 in avi
   driver libmpeg2
 ;  dll "libmpeg2"
@@ -367,7 +370,8 @@ videocodec ffmpeg12mc
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1,m1v1,"m1v "
+  fourcc m2v1,m1v1
+  fourcc "m1v "
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo_xvmc"
@@ -400,7 +404,8 @@ videocodec ffmpeg12vdpau
   fourcc AVmp
   fourcc mp2v,mpgv
   fourcc LMP2 ; Lead mpeg2 in avi
-  fourcc m2v1,m1v1,"m1v "
+  fourcc m2v1,m1v1
+  fourcc "m1v "
   driver ffmpeg
   dll "mpegvideo_vdpau"
   out VDPAU_MPEG1
@@ -465,7 +470,8 @@ videocodec mpegpes
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1,m1v1,"m1v "
+  fourcc m2v1,m1v1
+  fourcc "m1v "
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc LMP2 ; Lead mpeg2 in avi


More information about the MPlayer-cvslog mailing list