summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf7
-rw-r--r--libmpdemux/demux_lavf.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index f57852c968..618471ed20 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2503,6 +2503,13 @@ audiocodec ffadpcmimaws
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
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index f6e2a6f9fc..8ad8ad076f 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -84,6 +84,7 @@ const CodecTag mp_wav_tags[] = {
{ 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 },
};