Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv30624 Modified Files: configure Log Message: libfaad2 v1.0, v1.1, v1.2 detection, and API change workaround in ad_faad.c based on patch by Andre Schulz <andre@0wnage.de> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.651 retrieving revision 1.652 diff -u -r1.651 -r1.652 --- configure 7 Feb 2003 18:56:55 -0000 1.651 +++ configure 7 Feb 2003 21:04:16 -0000 1.652 @@ -3751,7 +3751,7 @@ echores "$_vorbis" -echocheck "FAAD (AAC) support" +echocheck "faad2 (AAC) support" if test "$_faad" = auto ; then _faad=no cat > $TMPC << EOF @@ -3766,7 +3766,34 @@ else _def_faad='#undef HAVE_FAAD' fi -echores "$_faad" + +if test "$_faad" = yes; then +cat > $TMPC <<EOF +#include <faad.h> +#ifndef FAAD_MIN_STREAMSIZE +#error Too old version +#endif +int main(void) { +#ifdef FAAD2_VERSION + printf("%s",FAAD2_VERSION); +#else + printf("1.0"); +#endif + return 0; +} +EOF + if cc_check $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then + _faad_version=`"$TMPO"` + _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\+\)\.\([0-9]\+\).*/\1\2/'` + _def_faad_version="#define FAADVERSION $_faad_tempversion" + echores "yes ($_faad_version)" + else + _faad=no + echores "no (failed to get version)" + fi +else + echores "$_faad" +fi if test "$_win32" = auto ; then if x86 ; then @@ -5251,6 +5278,7 @@ /* enable FAAD (AAC) support */ $_def_faad +$_def_faad_version /* enable streaming */ $_def_streaming