changeset 14638:fdea66294b26

makes --enable-*-faad really enable without any further check and drop support for old external faad2 versions (<= 1.1)

--- a/ChangeLog	Thu Feb 03 01:22:50 2005 +0000
+++ b/ChangeLog	Thu Feb 03 17:35:49 2005 +0000
@@ -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

--- a/configure	Thu Feb 03 01:22:50 2005 +0000
+++ b/configure	Thu Feb 03 17:35:49 2005 +0000
@@ -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

--- a/libmpcodecs/ad_faad.c	Thu Feb 03 01:22:50 2005 +0000
+++ b/libmpcodecs/ad_faad.c	Thu Feb 03 17:35:49 2005 +0000
@@ -122,13 +122,8 @@
     }
 
     /* init the codec */
-#if (FAADVERSION <= 11)
-    faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
-       &faac_samplerate, &faac_channels);
-#else
     faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
        sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
-#endif
 
     sh->a_in_buffer_len -= (faac_init > 0)?faac_init:0; // how many bytes init consumed
     // XXX FIXME: shouldn't we memcpy() here in a_in_buffer ?? --A'rpi
@@ -227,11 +222,7 @@
   if(!sh->codecdata_len){
    // raw aac stream:
    do {
-#if (FAADVERSION <= 11)
-    faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j);
-#else
     faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j, sh->a_in_buffer_len);
-#endif
 	
     /* update buffer index after faacDecDecode */
     if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) {
@@ -253,11 +244,7 @@
     unsigned char* bufptr=NULL;
     int buflen=ds_get_packet(sh->ds, &bufptr);
     if(buflen<=0) break;
-#if (FAADVERSION <= 11)
-    faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr);
-#else
     faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr, buflen);
-#endif
 //    printf("FAAC decoded %d of %d  (err: %d)  \n",faac_finfo.bytesconsumed,buflen,faac_finfo.error);
   }