Merge commit 'meins/master'

diff --git a/NEWS b/NEWS
index bfff0df163864e7bc66abac3f8200c74f90832f2..123358ecfbb7e8a0a046cb5efb88b437581b931b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ NEWS
 ----------------------------------------------
 0.3.4 (to be announced) "elliptic inheritance"
 ----------------------------------------------
-
+       - new options for mp3dec: --ignore-crc, --bufsize
 
 --------------------------------------------
 0.3.3 (2008-12-01) "axiomatic perspectivity"

diff --git a/configure.ac b/configure.ac
index 04a4e934c6ab7b2d90d9d9825ac30e4f13c431aa..62223839a82d9ce85d00e08e3f0e95b256d8c67b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -366,8 +366,6 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
        AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
-       filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
-       audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
        all_errlist_objs="$all_errlist_objs aac_common aacdec_filter aac_afh"
        filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
        afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
@@ -414,6 +412,8 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [
 ])
 if test "$have_mad" = "yes"; then
        AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
+       filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
+       audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
        all_errlist_objs="$all_errlist_objs mp3dec_filter"
        filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
        audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"