From 2b93a48ac8e092a74001b406ed9a20b6025faee6 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 10 Nov 2009 19:11:13 +0000
Subject: Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
 hardware.

Original patch by NVIDIA corporation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index bdf3568efe..ac3dc06aca 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -954,6 +954,37 @@ videocodec ffodivx
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
 
+videocodec ffodivxvdpau
+  info "FFmpeg MPEG-4,DIVX-4/5 (VDPAU)"
+  status working
+  fourcc FMP4,fmp4
+  fourcc DIVX,divx
+  fourcc DIV1,div1 divx
+  fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+  fourcc M4S2,m4s2
+  fourcc xvid,XVID,XviD,XVIX
+  fourcc DX50,dx50,BLZ0 DX50
+  fourcc mp4v,MP4V
+  format 0x4
+  fourcc UMP4
+  fourcc RMP4
+  fourcc 3IV2,3iv2  ; 3ivx Delta 4
+  fourcc DXGM
+  fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
+  fourcc SMP4,smp4 ; Samsung SMP4 video codec
+  fourcc VIDM ; vidm 4.01 codec
+  format 0x10000004  ; mpeg 4 es
+  fourcc m4cc,M4CC
+  fourcc hdx4,HDX4
+  fourcc FVFW,fvfw
+  fourcc FFDS
+  fourcc DCOD,MVXM,EM4A,PM4V
+  fourcc M4T3,DMK2,DIGI,INMC
+  fourcc EPHV,SN40
+  driver ffmpeg
+  dll mpeg4_vdpau
+  out VDPAU_MPEG4
+
 videocodec ffwv1f
   info "WV1F MPEG-4"
   status working
-- 
cgit v1.2.3