summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-15 07:53:21 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-15 07:53:21 +0000
commit720feba14262658c951b60fc0ea8a5d305fe3516 (patch)
tree808729d76b1020b0a2476cc33075852ebf08489a /etc
parentd999d7652db69a1c431ed1414f039b1caf156291 (diff)
downloadmpv-720feba14262658c951b60fc0ea8a5d305fe3516.tar.bz2
mpv-720feba14262658c951b60fc0ea8a5d305fe3516.tar.xz
Sync fourcc list for ffmpeg12vdpau
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28579 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf15
1 files changed, 12 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a269adb9d5..6c01a8fc4d 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -278,12 +278,13 @@ videocodec ffmpeg12vdpau
format 0x10000001 ; MPEG-1
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 "DVR "
+ fourcc hdv2
fourcc MPEG
+ fourcc hdv1
fourcc hdv3 ; HDV 1080i50
fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
@@ -294,6 +295,14 @@ videocodec ffmpeg12vdpau
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 LMP2 ; Lead mpeg2 in avi
driver ffmpeg
dll "mpegvideo_vdpau"
out VDPAU_MPEG1