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

[diego]

Author: diego
Date: Thu Jun 17 10:22:21 2010
New Revision: 31442

Log:
Lower priority of hardware MPEG decoder cards below software decoders.
Nowadays these cards are vintage hardware. The default case should be to try
software decoders first; people with hardware cards can adjust their setups.

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Thu Jun 17 10:17:06 2010	(r31441)
+++ trunk/etc/codecs.conf	Thu Jun 17 10:22:21 2010	(r31442)
@@ -124,37 +124,6 @@ videocodec blackmagic
   out BGR32,RGB32
 
 ; MPEG-1/2 decoding:
-; Note: mpegpes is preferred for hw decoders:
-
-videocodec mpegpes
-  info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
-  comment "for hardware decoding"
-  status working
-  format 0x10000001  ; mpeg 1
-  format 0x10000002  ; mpeg 2
-  fourcc mpg1,MPG1,mpg2,MPG2
-  fourcc MPEG
-  fourcc hdv1,hdv2,hdv3
-  fourcc hdv5
-  fourcc hdv6,hdv7,hdv8
-  fourcc xdv1,xdv2,xdv3
-  fourcc xdv4,xdv5,xdv6
-  fourcc xdv7,xdv8,xdv9
-  fourcc xdva,xdvb,xdvc
-  fourcc xdvd,xdve,xdvf
-  fourcc xd5a,xd5b,xd5c
-  fourcc xd5d,xd5e,xd5f
-  fourcc xd59
-  fourcc mx5n,mx4n,mx4p
-  fourcc mx3n,mx3p
-  fourcc AVmp
-  fourcc mp2v,mpgv
-  fourcc m2v1,m1v1
-  fourcc PIM1        ; Pinnacle hardware-MPEG-1
-  fourcc PIM2        ; Pinnacle hardware-MPEG-2
-  fourcc LMP2 ; Lead mpeg2 in avi
-  driver mpegpes
-  out MPES
 
 videocodec ffmpeg1
   info "FFmpeg MPEG-1"
@@ -357,6 +326,36 @@ videocodec ffmpeg12vdpau
   out VDPAU_MPEG1
   out VDPAU_MPEG2
 
+videocodec mpegpes
+  info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
+  comment "for hardware decoding"
+  status working
+  format 0x10000001  ; mpeg 1
+  format 0x10000002  ; mpeg 2
+  fourcc mpg1,MPG1,mpg2,MPG2
+  fourcc MPEG
+  fourcc hdv1,hdv2,hdv3
+  fourcc hdv5
+  fourcc hdv6,hdv7,hdv8
+  fourcc xdv1,xdv2,xdv3
+  fourcc xdv4,xdv5,xdv6
+  fourcc xdv7,xdv8,xdv9
+  fourcc xdva,xdvb,xdvc
+  fourcc xdvd,xdve,xdvf
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d,xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
+  fourcc mp2v,mpgv
+  fourcc m2v1,m1v1
+  fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
+  fourcc LMP2 ; Lead mpeg2 in avi
+  driver mpegpes
+  out MPES
+
 ; we have only native open source codecs for these:
 
 videocodec ffnuv