diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-28 00:40:49 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-28 00:40:49 +0000 |
| commit | d1c91ec0124f8f87e48edb454cc05a5af07152c8 (patch) | |
| tree | 700b844769ee323927bc0f4dac96b49b1e6e8eb5 | |
| parent | 90f76657898574b7123a3762593850f6a296b852 (diff) | |
| download | mpv-d1c91ec0124f8f87e48edb454cc05a5af07152c8.tar.bz2 mpv-d1c91ec0124f8f87e48edb454cc05a5af07152c8.tar.xz | |
add support for musepack native decoder from ffmpeg (require -demuxer lavf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 65207065f9..b16d915bd2 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2822,6 +2822,14 @@ audiocodec ffdts driver ffmpeg dll "dts" +audiocodec ffmusepack7 + info "Musepack sv7 audio codec" + status working + fourcc "MPC " + format 0x2b4d + driver ffmpeg + dll "mpc sv7" + audiocodec musepack info "Musepack audio codec" status working diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 47d8cfdc2f..5472505adf 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -78,6 +78,7 @@ const CodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, + { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')}, |