From 211e93aeec5864a4cef2568703bbdd9dca171280 Mon Sep 17 00:00:00 2001 From: compn Date: Fri, 25 Mar 2011 13:58:26 +0000 Subject: codecs.conf: cleanup/unify hdv* fourccs, except vdpau git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33113 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 12e8e7cea5..d3df898ef8 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -184,15 +184,13 @@ videocodec ffmpeg2 format 0x10000002 ; MPEG-2 fourcc mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 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 fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -226,15 +224,13 @@ videocodec ffmpeg12 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 fourcc "DVR " - fourcc hdv2 fourcc MPEG - fourcc hdv1 - fourcc hdv3 ; HDV 1080i50 - fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -262,17 +258,15 @@ videocodec ffmpeg12mc format 0x10000002 ; MPEG-2 fourcc mpg1,mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 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 - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -330,15 +324,13 @@ videocodec ffmpeg2crystalhd format 0x10000002 ; MPEG-2 fourcc mpg2,MPG2 fourcc "DVR " - fourcc hdv1 - fourcc hdv2 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 fourcc M701 ; matrox mpeg2 intra-only - fourcc hdv6,hdv7,hdv8 + fourcc hdv1,hdv2,hdv3 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 @@ -369,8 +361,8 @@ videocodec mpegpes fourcc mpg1,MPG1,mpg2,MPG2 fourcc MPEG fourcc hdv1,hdv2,hdv3 - fourcc hdv5 - fourcc hdv6,hdv7,hdv8 + fourcc hdv4,hdv5,hdv6 + fourcc hdv7,hdv8,hdv9 fourcc xdv1,xdv2,xdv3 fourcc xdv4,xdv5,xdv6 fourcc xdv7,xdv8,xdv9 -- cgit v1.2.3