[MPlayer-cvslog] CVS: main AUTHORS, 1.164, 1.165 ChangeLog, 1.260, 1.261 Makefile, 1.330, 1.331 configure, 1.1098, 1.1099

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	AUTHORS ChangeLog Makefile configure 
Log Message:
Speex support. Seeking and pts generation does not work.


Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- AUTHORS	29 Oct 2005 23:45:48 -0000	1.164
+++ AUTHORS	5 Nov 2005 11:58:24 -0000	1.165
@@ -216,6 +216,7 @@
     * 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
+    * speex decoder via libspeex
     * MPEG-2 in GXF demuxer
     * vo_gl ported to windows
     * gl_commmon.[ch] to decrease code duplication

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- ChangeLog	26 Oct 2005 22:57:15 -0000	1.260
+++ ChangeLog	5 Nov 2005 11:58:24 -0000	1.261
@@ -34,6 +34,7 @@
     * 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)
+    * experimental speex support via libspeex
     * On2 VP7 video decoder via binary DLL
     * Duck/On2 TrueMotion2 (TM20) support via lavc
     * support FLX and DTA extensions for flic files

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- Makefile	19 Aug 2005 19:24:30 -0000	1.330
+++ Makefile	5 Nov 2005 11:58:24 -0000	1.331
@@ -104,6 +104,7 @@
              $(XMMS_LIB) \
              $(X264_LIB) \
              $(MUSEPACK_LIB) \
+             $(SPEEX_LIB) \
 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(W32_LIB) \

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -r1.1098 -r1.1099
--- configure	5 Nov 2005 09:57:13 -0000	1.1098
+++ configure	5 Nov 2005 11:58:24 -0000	1.1099
@@ -243,6 +243,7 @@
   --enable-tremor-low    build with lower accuracy internal tremor [disabled]
   --enable-external-tremor build with external tremor [disabled]
   --disable-vorbis       disable OggVorbis support entirely [autodetect]
+  --disable-speex        disable Speex support [autodetect]
   --enable-theora        build with OggTheora support [autodetect]
   --disable-internal-matroska disable internal Matroska support [enabled]
   --enable-external-faad build with external FAAD2 (AAC) support [autodetect]
@@ -1486,6 +1487,7 @@
 _tremor_internal=yes
 _tremor_low=no
 _vorbis=auto
+_speex=auto
 _theora=auto
 _mp3lib=yes
 _liba52=yes
@@ -1679,6 +1681,8 @@
   --disable-liblzo)	_liblzo=no		;;
   --enable-vorbis)	_vorbis=yes	;;
   --disable-vorbis)	_vorbis=no	;;
+  --enable-speex)	_speex=yes	;;
+  --disable-speex)	_speex=no	;;
   --enable-internal-tremor)	_tremor_internal=yes	;;
   --disable-internal-tremor)	_tremor_internal=no	;;
   --enable-tremor-low)	_tremor_low=yes	;;
@@ -5389,6 +5393,29 @@
 fi
 echores "$_vorbis"
 
+echocheck "libspeex (version >= 1.1 required)"
+if test "$_speex" = auto ; then
+  _speex=no
+  cat > $TMPC << EOF
+#include <speex/speex.h>
+int main(void) {
+  SpeexBits bits;
+  void *dec;
+  speex_decode_int(dec, &bits, dec);
+}
+EOF
+  cc_check -lspeex $_ld_lm && _speex=yes
+fi
+if test "$_speex" = yes ; then
+  _def_speex='#define HAVE_SPEEX 1'
+  _ld_speex='-lspeex'
+  _codecmodules="speex $_codecmodules"
+else
+  _def_speex='#undef HAVE_SPEEX'
+  _nocodecmodules="speex $_nocodecmodules"
+fi
+echores "$_speex"
+
 echocheck "OggTheora support"
 if test "$_theora" = auto ; then
   _theora=no
@@ -6982,6 +7009,7 @@
 TREMOR = $_tremor_internal
 TREMOR_FLAGS = $_tremor_flags
 
+SPEEX = $_speex
 MUSEPACK = $_musepack
 
 UNRARLIB = $_unrarlib
@@ -7091,6 +7119,7 @@
 LIBLZO_LIB= $_ld_liblzo
 MAD_LIB = $_ld_mad
 VORBIS_LIB = $_ld_vorbis $_ld_libdv
+SPEEX_LIB = $_ld_speex
 THEORA_LIB = $_ld_theora
 FAAD_LIB = $_ld_faad
 INTERNAL_FAAD = $_faad_internal
@@ -7669,6 +7698,9 @@
 /* enable Tremor as vorbis decoder */
 $_def_tremor
 
+/* enable Speex support */
+$_def_speex
+
 /* enable musepack support */
 $_def_musepack