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

[reimar]

Author: reimar
Date: Mon Mar 17 21:15:22 2008
New Revision: 26259

Log:
Make FFmpeg mpeg1/2 decoder the default over libmpeg2


Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Mon Mar 17 21:15:22 2008
@@ -45,28 +45,6 @@ videocodec mpegpes
   driver mpegpes
   out MPES
 
-videocodec mpeg12
-  info "MPEG-1 or 2 (libmpeg2)"
-  comment "with postprocessing"
-  status working
-  format 0x10000001  ; MPEG-1
-  format 0x10000002  ; MPEG-2
-  fourcc "DVR "
-  fourcc hdv2
-  fourcc mpg1
-  fourcc PIM1        ; Pinnacle hardware-MPEG-1
-  fourcc VCR2
-  fourcc mpg2,MPG2
-  fourcc MPEG
-  fourcc hdv3        ; HDV 1080i50
-  fourcc hdv5        ; HDV  720p25
-  fourcc mx5p        ; MPEG IMX 625/50 (50 Mb/s)
-  fourcc MMES,mmes   ; matrox mpeg2 in avi
-  driver libmpeg2
-;  dll "libmpeg2"
-  out YV12,I420,IYUV
-  out 422P
-
 videocodec ffmpeg1
   info "FFmpeg MPEG-1"
   status working
@@ -117,6 +95,28 @@ videocodec ffmpeg12
   out YV12,I420,IYUV
   out 422P,444P
 
+videocodec mpeg12
+  info "MPEG-1 or 2 (libmpeg2)"
+  comment "with postprocessing"
+  status working
+  format 0x10000001  ; MPEG-1
+  format 0x10000002  ; MPEG-2
+  fourcc "DVR "
+  fourcc hdv2
+  fourcc mpg1
+  fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc VCR2
+  fourcc mpg2,MPG2
+  fourcc MPEG
+  fourcc hdv3        ; HDV 1080i50
+  fourcc hdv5        ; HDV  720p25
+  fourcc mx5p        ; MPEG IMX 625/50 (50 Mb/s)
+  fourcc MMES,mmes   ; matrox mpeg2 in avi
+  driver libmpeg2
+;  dll "libmpeg2"
+  out YV12,I420,IYUV
+  out 422P
+
 videocodec ffmpeg12mc
   info "FFmpeg MPEG-1/2 (XvMC)"
   status buggy