[MPlayer-cvslog] CVS: main ChangeLog, 1.168, 1.169 configure, 1.959, 1.960

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

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

Modified Files:
	ChangeLog configure 
Log Message:
makes --enable-*-faad really enable without any further check and drop support for old external faad2 versions (<= 1.1)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog	25 Jan 2005 00:28:48 -0000	1.168
+++ ChangeLog	3 Feb 2005 17:35:49 -0000	1.169
@@ -21,6 +21,7 @@
     * fixed decoding of stereo alaw files
     * preload QT DLLs to work around problems with their hardcoded paths
     * support for Real 10 RV30/40 binary codec
+    * dropped support of old faad2 versions (<= 1.1)
 
     Demuxers:
     * vqf demuxer

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -r1.959 -r1.960
--- configure	2 Feb 2005 14:07:13 -0000	1.959
+++ configure	3 Feb 2005 17:35:49 -0000	1.960
@@ -5319,7 +5319,10 @@
     _faad_external=no
     cat > $TMPC << EOF
 #include <faad.h>
-int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); return 0; }
+#ifndef FAAD_MIN_STREAMSIZE
+#error Too old version
+#endif
+int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; }
 EOF
     cc_check $_inc_faad $_ld_faad $_ld_lm && _faad_external=yes
   fi
@@ -5328,34 +5331,6 @@
   echores "no"
 fi
 
-if test "$_faad_internal" = yes -o "$_faad_external" = yes; then
-echocheck "FAAD2 version"
-cat > $TMPC <<EOF
-#include <faad.h>
-#ifndef FAAD_MIN_STREAMSIZE
-#error Too old version
-#endif
-int main(void) {
-#ifdef FAAD2_VERSION
-  printf("%s\n",FAAD2_VERSION);
-#else
-  printf("1.0\n");
-#endif
-  return 0;
-}
-EOF
-  if cc_check -I- $_inc_faad $_ld_faad $_ld_lm && "$TMPO" >> "$TMPLOG" ; then
-    _faad_version=`"$TMPO"`
-    _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/'`
-    _def_faad_version="#define FAADVERSION $_faad_tempversion"
-    echores "$_faad_version"
-  else
-    _faad_external=no
-    _faad_internal=no
-    echores "failed to get version"
-  fi
-fi
-
 if test "$_faad_external" = yes; then
   _def_faad='#define HAVE_FAAD 1'
   _codecmodules="faad2(external) $_codecmodules"
@@ -7345,7 +7320,6 @@
 /* enable FAAD (AAC) support */
 $_def_faad
 $_def_faad_internal
-$_def_faad_version
 
 /* enable LADSPA plugin support */
 $_def_ladspa