aac: Fix compilation without libmp4v2.

This was broken for two reasons: First, the aac audio format handler
depends on libmp4v2 rather than libfaad. Second, we must include
aac_common if either libfaad or libmp4v2 (or both) were found. The
logic in configure.ac got this wrong.

diff --git a/afh_common.c b/afh_common.c
index 7947a66519f8dba3784257bcce6669942d4fa9ad..31e4f4ec78740a74d8e73adef903b45226a5d5fe 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -48,7 +48,7 @@ static struct audio_format_handler afl[] = {
        },
        {
                .name = "aac",
        },
        {
                .name = "aac",

-#ifdef HAVE_FAAD
+#if defined(HAVE_MP4V2)

                .init = aac_afh_init,
 #endif
        },
                .init = aac_afh_init,
 #endif
        },

diff --git a/configure.ac b/configure.ac
index 8b5fb95193b3c15cec63fa64f2c4468a24e76cef..bd1b5f5d2f9bf2385fc92cd56f7139f3c0f6acb9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -949,8 +949,14 @@ NEED_OPUS_OBJECTS &&
 NEED_FLAC_OBJECTS && {
        play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 }
 NEED_FLAC_OBJECTS && {
        play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 }

-if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
-       play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
+if test $HAVE_FAAD = yes; then
+       play_errlist_objs="$play_errlist_objs aacdec_filter"
+fi
+if test $HAVE_MP4V2 = yes; then
+       play_errlist_objs="$play_errlist_objs aac_afh"
+fi
+if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
+       play_errlist_objs="$play_errlist_objs aac_common"

 fi
 if test $HAVE_MAD = yes; then
        play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
 fi
 if test $HAVE_MAD = yes; then
        play_cmdline_objs="$play_cmdline_objs mp3dec_filter"