diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-16 01:17:19 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-16 01:17:19 +0000 |
| commit | 199d26ea920ae674b81eb468836f62e1a22b57ec (patch) | |
| tree | 320e777c053fbc04b750959acb18939a0a4d7bf1 | |
| parent | ac47a614cd17bd3b29d74f21f17d5a0e4060b1de (diff) | |
support for Interplay DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 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 762fb81be1..13071960bc 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2456,6 +2456,13 @@ audiocodec ffadpcmimaws driver ffmpeg dll adpcm_ima_ws +audiocodec ffinterplaydpcm + info "FFmpeg Interplay DPCM audio" + status working + fourcc INPA + driver ffmpeg + dll interplay_dpcm + audiocodec libdv info "raw DV audio decoder (libdv)" status working diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index a07485cac6..10e7866192 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -74,6 +74,7 @@ int64_t ff_gcd(int64_t a, int64_t b); const CodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, + { CODEC_ID_INTERPLAY_DPCM,MKTAG('I', 'N', 'P', 'A')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, |