Mercurial > mplayer.hg

changeset 21763:43c8f1aa82bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for musepack native decoder from ffmpeg (require -demuxer lavf)
author aurel
date Thu, 28 Dec 2006 00:40:49 +0000
parents 793af3b2cfd4
children 309992959801
files etc/codecs.conf libmpdemux/demux_lavf.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Dec 27 13:42:32 2006 +0000
+++ b/etc/codecs.conf	Thu Dec 28 00:40:49 2006 +0000
@@ -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
--- a/libmpdemux/demux_lavf.c	Wed Dec 27 13:42:32 2006 +0000
+++ b/libmpdemux/demux_lavf.c	Thu Dec 28 00:40:49 2006 +0000
@@ -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')},