Mercurial > mplayer.hg

changeset 21362:76f120c4e0f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support for Westwood SND1 audio
author diego
date Wed, 29 Nov 2006 10:51:39 +0000
parents be2e003cdd10
children 8618755f2c06
files etc/codecs.conf libmpdemux/demux_lavf.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Nov 29 10:33:42 2006 +0000
+++ b/etc/codecs.conf	Wed Nov 29 10:51:39 2006 +0000
@@ -2503,6 +2503,13 @@
   driver ffmpeg
   dll adpcm_ima_ws
 
+audiocodec ffwssnd1
+  info "FFmpeg Westwood SND1"
+  status working
+  fourcc SND1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll ws_snd1
+
 audiocodec ffinterplaydpcm
   info "FFmpeg Interplay DPCM audio"
   status working
--- a/libmpdemux/demux_lavf.c	Wed Nov 29 10:33:42 2006 +0000
+++ b/libmpdemux/demux_lavf.c	Wed Nov 29 10:51:39 2006 +0000
@@ -84,6 +84,7 @@
     { CODEC_ID_SHORTEN,           MKTAG('s', 'h', 'r', 'n')},
     { CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1')},
     { CODEC_ID_WAVPACK,           MKTAG('W', 'V', 'P', 'K')},
+    { CODEC_ID_WESTWOOD_SND1,     MKTAG('S', 'N', 'D', '1')},
     { CODEC_ID_XAN_DPCM,          MKTAG('A', 'x', 'a', 'n')},
     { 0, 0 },
 };