summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 12:18:19 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-01 12:18:19 +0000
commit0ae6b046a24086e1a7a731f0f75bdad48ae00318 (patch)
tree51f8a2752d18553a4188d9a1cb963559d2d7429e /etc
parentd44aa2311811d6f43cf8e0dd07cf3ed925c1da71 (diff)
downloadmpv-0ae6b046a24086e1a7a731f0f75bdad48ae00318.tar.bz2
mpv-0ae6b046a24086e1a7a731f0f75bdad48ae00318.tar.xz
add hdv1 fourcc
sync from vlc's fourcc.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27389 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index b8dcad3379..cd00c4d210 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -77,6 +77,8 @@ videocodec mpegpes
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
@@ -104,6 +106,7 @@ videocodec ffmpeg2
format 0x10000002 ; MPEG-2
fourcc mpg2,MPG2
fourcc "DVR "
+ fourcc hdv1
fourcc hdv2
fourcc MPEG
fourcc hdv3 ; HDV 1080i50
@@ -133,6 +136,7 @@ videocodec ffmpeg12
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)
@@ -161,6 +165,7 @@ videocodec mpeg12
fourcc VCR2
fourcc mpg2,MPG2
fourcc MPEG
+ fourcc hdv1
fourcc hdv3 ; HDV 1080i50
fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
@@ -183,6 +188,7 @@ videocodec ffmpeg12mc
format 0x10000002 ; MPEG-2
fourcc mpg1,mpg2,MPG2
fourcc "DVR "
+ fourcc hdv1
fourcc hdv2
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc VCR2