[MPlayer-cvslog] CVS: main AUTHORS, 1.155, 1.156 ChangeLog, 1.227, 1.228 Makefile, 1.325, 1.326 configure, 1.1027, 1.1028

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv29636

Modified Files:
	AUTHORS ChangeLog Makefile configure 
Log Message:
musepack demuxing and decoding support (demuxing is v7 bitstream only).


Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- AUTHORS	30 Jun 2005 09:04:15 -0000	1.155
+++ AUTHORS	10 Jul 2005 17:14:09 -0000	1.156
@@ -210,6 +210,7 @@
     * reworked live changing playback speed
     * made MMS over HTTP stream selection work and modified ASF header parsing
     * reimplemented ao_jack without bio2jack dependency
+    * musepack demuxer and decoder, based on Reza's patch
 
 Dolbeau, Romain <romain at dolbeau.org>
     * random AltiVec (PowerPC multimedia extensions) stuff
@@ -371,6 +372,7 @@
     * seeking in Real files without index
     * savage_vid VIDIX driver
     * miscellaneous small fixes and improvements
+    * first musepack decoding patch
 
 Jermann, Jonas (g0th) <jjermann at gmx.net>
     * manual page rewrite

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog	10 Jul 2005 09:20:57 -0000	1.227
+++ ChangeLog	10 Jul 2005 17:14:09 -0000	1.228
@@ -19,6 +19,9 @@
     * Fraps video decoder via binary DLL
     * support for 8-bit PNGs with palette
     * support for dmb1 MJPEG files with ffmjpeg
+    * support for musepack audio (WARNING: when muxing into e.g. AVI
+      you will be able to seek, but you might get ear- and speaker-breaking
+      noises)
 
     Demuxers:
     * simultaneous audio capture and playback in MPlayer

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- Makefile	27 Jun 2005 20:08:38 -0000	1.325
+++ Makefile	10 Jul 2005 17:14:09 -0000	1.326
@@ -94,6 +94,7 @@
              $(ALSA_LIB) \
              $(XMMS_LIB) \
              $(X264_LIB) \
+             $(MUSEPACK_LIB) \
 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(W32_LIB) \

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1027
retrieving revision 1.1028
diff -u -r1.1027 -r1.1028
--- configure	10 Jul 2005 17:01:49 -0000	1.1027
+++ configure	10 Jul 2005 17:14:10 -0000	1.1028
@@ -233,6 +233,7 @@
   --disable-liba52       disable builtin liba52 [enabled]
   --enable-libdts        enable libdts support [autodetect]
   --disable-libmpeg2     disable builtin libmpeg2 [enabled]
+  --disable-musepack     disable musepack support [autodetect]
   --disable-amr_nb       disable amr narrowband, floating point [autodetect]
   --disable-amr_nb-fixed disable amr narrowband, fixed point [autodetect]
   --disable-amr_wb       disable amr wideband, floating point [autodetect]
@@ -1476,6 +1477,7 @@
 _inet6=auto
 _gethostbyname2=auto
 _ftp=yes
+_musepack=auto
 _vstream=auto
 _pthreads=yes
 for ac_option do
@@ -1595,6 +1597,8 @@
   --disable-libdts)	_libdts=no      ;;
   --enable-libmpeg2)	_libmpeg2=yes	;;
   --disable-libmpeg2)	_libmpeg2=no	;;
+  --enable-musepack)	_musepack=yes	;;
+  --disable-musepack)	_musepack=no	;;
   --enable-internal-matroska)  _matroska_internal=yes ;;
   --disable-internal-matroska) _matroska_internal=no ;;
   --enable-internal-faad)	_faad_internal=yes	_faad_external=no	;;
@@ -5446,6 +5450,30 @@
 fi
 echores "$_libmpeg2"
 
+echocheck "patched libmpcdec (musepack)"
+if test "$_musepack" = auto ; then
+  _musepack=no
+  cat > $TMPC << EOF
+#include <mpcdec/mpcdec.h>
+int main(void) {
+  mpc_streaminfo info;
+  mpc_decoder decoder;
+  mpc_decoder_set_streaminfo(&decoder, &info);
+  mpc_decoder_decode_frame(&decoder, NULL, 0, NULL);
+}
+EOF
+  cc_check -lmpcdec $_ld_lm && _musepack=yes
+fi
+if test "$_musepack" = yes ; then
+  _def_musepack='#define HAVE_MUSEPACK 1'
+  _ld_musepack='-lmpcdec'
+  _codecmodules="musepack $_codecmodules"
+else
+  _def_musepack='#undef HAVE_MUSEPACK'
+  _nocodecmodules="musepack $_nocodecmodules"
+fi
+echores "$_musepack"
+
 
 echocheck "Matroska support"
 if test "$_matroska_internal" = yes ; then
@@ -6899,6 +6927,8 @@
 TREMOR = $_tremor_internal
 TREMOR_FLAGS = $_tremor_flags
 
+MUSEPACK = $_musepack
+
 UNRARLIB = $_unrarlib
 HAVE_FFPOSTPROCESS = $_def_haveffpostprocess
 PNG = $_mkf_png
@@ -7019,6 +7049,7 @@
 TOOLAME_LIB=$_toolame_lib
 TWOLAME=$_twolame
 TWOLAME_LIB=$_twolame_lib
+MUSEPACK_LIB = $_ld_musepack
 FAAC=$_faac
 FAAC_LIB=$_ld_faac
 AMR_NB=$_amr_nb
@@ -7559,6 +7590,9 @@
 /* enable Tremor as vorbis decoder */
 $_def_tremor
 
+/* enable musepack support */
+$_def_musepack
+
 /* enable OggTheora support */
 $_def_theora