summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpdemux/demux_lavf.c1
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')},