diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-07 16:31:12 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-07 16:31:12 +0000 |
commit | 31a7f771644a6462a040652c6b4015cd469a0a9e (patch) | |
tree | 864436ebb4e0753e4a30ec35764e9dd946b5954a | |
parent | 8d62ac34467432118170aed914493cb6fb37032d (diff) | |
download | mpv-31a7f771644a6462a040652c6b4015cd469a0a9e.tar.bz2 mpv-31a7f771644a6462a040652c6b4015cd469a0a9e.tar.xz |
support for THP ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22934 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 b889b8d85a..e07fdcbbc2 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2611,6 +2611,13 @@ audiocodec ffxandpcm driver ffmpeg dll xan_dpcm +audiocodec ffadpcmthp + info "FFmpeg THP ADPCM audio" + status working + fourcc THPA + driver ffmpeg + dll adpcm_thp + audiocodec libdv info "raw DV audio decoder (libdv)" status working diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index c121ad2741..f4e5acd9f2 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -73,6 +73,7 @@ static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, + { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')}, { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, |