From d1c91ec0124f8f87e48edb454cc05a5af07152c8 Mon Sep 17 00:00:00 2001
From: aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 28 Dec 2006 00:40:49 +0000
Subject: 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
---
 etc/codecs.conf         | 8 ++++++++
 libmpdemux/demux_lavf.c | 1 +
 2 files changed, 9 insertions(+)

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')},
-- 
cgit v1.2.3