Mercurial > mplayer.hg

changeset 34246:4f35512cf7b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix "m1v " playback. It seems the codecs.conf parser does not accept fourcc's with spaces after other fourcc's.
author cehoyos
date Wed, 09 Nov 2011 00:32:12 +0000
parents 3498659ef543
children 1c35122fba8c
files etc/codecs.conf
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Nov 08 23:51:41 2011 +0000
+++ b/etc/codecs.conf	Wed Nov 09 00:32:12 2011 +0000
@@ -213,7 +213,8 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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