# HG changeset patch
# User reimar
# Date 1379244894 0
# Node ID 44ab9f9a4f423eed7ff0ec24ac66bfd69237f0cb
# Parent  20b8efbdfba4a11d80357079bb2819183a502187
Restore VDPAU codecs using non-hwaccel interface with "old" suffix.

diff -r 20b8efbdfba4 -r 44ab9f9a4f42 etc/codecs.conf
--- a/etc/codecs.conf	Sun Sep 15 11:29:03 2013 +0000
+++ b/etc/codecs.conf	Sun Sep 15 11:34:54 2013 +0000
@@ -546,6 +546,39 @@
   out VDPAU_MPEG1
   out VDPAU_MPEG2
 
+videocodec ffmpeg12vdpauold
+  info "FFmpeg MPEG-1/2 (VDPAU)"
+  status working
+  format 0x10000001  ; MPEG-1
+  format 0x10000002  ; MPEG-2
+  fourcc mpg1,mpg2,MPG2
+  fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
+  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 hdv6,hdv7,hdv8
+  fourcc xdv1,xdv2,xdv3
+  fourcc xdv4,xdv5,xdv6
+  fourcc xdv7,xdv8,xdv9
+  fourcc xdva,xdvb,xdvc
+  fourcc xdvd,xdve,xdvf
+  fourcc mx5n,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
+  fourcc mp2v,mpgv
+  fourcc LMP2 ; Lead mpeg2 in avi
+  fourcc m2v1,m1v1
+  fourcc "m1v "
+  driver ffmpeg
+  dll "mpegvideo_vdpau"
+  out VDPAU_MPEG1
+  out VDPAU_MPEG2
+
 videocodec ffmpeg2crystalhd
   info "FFmpeg MPEG-2 (CrystalHD)"
   status working
@@ -1252,6 +1285,14 @@
   dll wmv3
   out VDPAU_WMV3
 
+videocodec ffwmv3vdpauold
+  info "FFmpeg WMV3/WMV9 (VDPAU)"
+  status buggy
+  fourcc WMV3,wmv3
+  driver ffmpeg
+  dll wmv3_vdpau
+  out VDPAU_WMV3
+
 videocodec ffwmv3crystalhd
   info "FFmpeg WMV3/WMV9 (CrystalHD)"
   status buggy
@@ -1278,6 +1319,15 @@
   dll vc1
   out VDPAU_VC1
 
+videocodec ffvc1vdpauold
+  info "FFmpeg WVC1 (VDPAU)"
+  status buggy
+  fourcc WVC1,wvc1,WMVA
+  fourcc vc-1,VC-1
+  driver ffmpeg
+  dll vc1_vdpau
+  out VDPAU_VC1
+
 videocodec ffvc1crystalhd
   info "FFmpeg WVC1 (CrystalHD)"
   status buggy
@@ -1351,6 +1401,24 @@
   dll h264
   out VDPAU_H264
 
+videocodec ffh264vdpauold
+  info "FFmpeg H.264 (VDPAU)"
+  status working
+  fourcc H264,h264
+  fourcc X264,x264
+  fourcc avc1,AVC1
+  fourcc davc,DAVC
+  fourcc ai1p,ai1q,ai12,ai13
+  fourcc ai15,ai16
+  fourcc ai5p,ai5q,ai52,ai53
+  fourcc ai55,ai56
+  fourcc x3eV
+  fourcc Q264,V264
+  format 0x10000005
+  driver ffmpeg
+  dll h264_vdpau
+  out VDPAU_H264
+
 videocodec ffh264crystalhd
   info "FFmpeg H.264 (CrystalHD)"
   status working
@@ -1489,6 +1557,41 @@
   dll mpeg4
   out VDPAU_MPEG4
 
+videocodec ffodivxvdpauold
+  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,WAWV
+  fourcc uldx,ULDX,VSPX
+  fourcc SIPP ; Samsung SHR-6040
+  fourcc DreX,DM4V,LMP4,DP02
+  fourcc QMP4
+  driver ffmpeg
+  dll mpeg4_vdpau
+  out VDPAU_MPEG4
+
 videocodec ffodivxcrystalhd
   info "FFmpeg MPEG-4,DIVX-4/5 (CrystalHD)"
   status working