[MPlayer-cvslog] r34815 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Thu Mar 15 13:45:50 2012
New Revision: 34815

Log:
remove HV60 from vdpau and xvid, does not work. add acm binary codecs

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Mar 14 11:59:20 2012	(r34814)
+++ trunk/etc/codecs.conf	Thu Mar 15 13:45:50 2012	(r34815)
@@ -1356,7 +1356,7 @@ videocodec ffodivxvdpau
   fourcc uldx,ULDX,VSPX
   fourcc SIPP ; Samsung SHR-6040
   fourcc DreX,DM4V,LMP4,DP02
-  fourcc QMP4,HV60
+  fourcc QMP4
   driver ffmpeg
   dll mpeg4_vdpau
   out VDPAU_MPEG4
@@ -1453,7 +1453,7 @@ videocodec xvid
   format 0x10000004  ; mpeg 4 es
   fourcc SIPP ; Samsung SHR-6040
   fourcc DreX,DM4V,LMP4,DP02
-  fourcc QMP4,HV60
+  fourcc QMP4
   driver xvid
   out YV12
   out I420
@@ -5216,6 +5216,20 @@ audiocodec voxware
   dll "voxmsdec.ax" ; need also msms001.vwp
   guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d
 
+audiocodec rhetorex
+  info "Rhetorex ADPCM"
+  status working
+  format 0x100
+  driver acm
+  dll "rhetorex.acm"
+
+audiocodec sanyo
+  info "Sanyo ADPCM"
+  status working
+  format 0x125
+  driver acm
+  dll "ldadp32.acm"
+
 audiocodec acelp
   info "ACELP.net Sipro Lab Audio"
   status working