# HG changeset patch
# User compn
# Date 1301061506 0
# Node ID 03599ed42ec76f8a4d605e1bbd5575f7b9b3eefd
# Parent  7f06781043d98d1506d5e900be301712e213a17d
cleanup/unify hdv* fourccs, except vdpau

diff -r 7f06781043d9 -r 03599ed42ec7 etc/codecs.conf
--- a/etc/codecs.conf	Fri Mar 25 12:40:20 2011 +0000
+++ b/etc/codecs.conf	Fri Mar 25 13:58:26 2011 +0000
@@ -184,15 +184,13 @@
   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 @@
   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,19 +258,17 @@
   format 0x10000001  ; MPEG-1
   format 0x10000002  ; MPEG-2
   fourcc "DVR "
-  fourcc hdv2
   fourcc mpg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc mpg2,MPG2
   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
@@ -301,17 +295,15 @@
   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
@@ -369,15 +361,13 @@
   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
@@ -408,8 +398,8 @@
   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