From 903ef1006211edcdf052ac240919ab4d60021006 Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 17 Mar 2008 20:15:22 +0000 Subject: Make FFmpeg mpeg1/2 decoder the default over libmpeg2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26259 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index 9fe0c628c6..0b60fe2fa5 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 -- cgit v1.2.3