Mercurial > mplayer.hg

changeset 34727:d35d064f4225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove HV60 from vdpau and xvid, does not work. add acm binary codecs
author compn
date Thu, 15 Mar 2012 12:45:50 +0000
parents 4de1fdc72ffd
children a28c4ba97171
files etc/codecs.conf
diffstat 1 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Mar 14 10:59:20 2012 +0000
+++ b/etc/codecs.conf	Thu Mar 15 12:45:50 2012 +0000
@@ -1356,7 +1356,7 @@
   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 @@
   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 @@
   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