diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-18 11:24:09 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-18 11:24:09 +0000 |
| commit | 67efdbe07a0b5451d93c825b28736af64a4b9c25 (patch) | |
| tree | 93953f0c55185ba96065f07ae75db6ca9f59dad0 | |
| parent | 6489a77e5402bfffca92352ec0785f61a197c875 (diff) | |
support for XAN DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 642cd235db..ae3fdfb76d 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2517,6 +2517,13 @@ audiocodec ffadpcmea driver ffmpeg dll adpcm_ea +audiocodec ffxandpcm + info "FFmpeg XAN DPCM audio" + status working + fourcc Axan + driver ffmpeg + dll xan_dpcm + audiocodec libdv info "raw DV audio decoder (libdv)" status working diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index effdb27276..67641fa4f9 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -83,6 +83,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_XAN_DPCM, MKTAG('A', 'x', 'a', 'n')}, { 0, 0 }, }; |