[MPlayer-cvslog] r21779 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c

[aurel]

Author: aurel
Date: Thu Dec 28 01:40:49 2006
New Revision: 21779

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/demux_lavf.c

Log:
add support for musepack native decoder from ffmpeg (require -demuxer lavf)


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Dec 28 01:40:49 2006
@@ -2822,6 +2822,14 @@
   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

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Thu Dec 28 01:40:49 2006
@@ -78,6 +78,7 @@
     { 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')},