Merge branch 'master' into next

diff --combined configure.ac
index cdbdae468d70aa7af88b695c3ae6c0cd2ee456fa,449246459f8619244e33e18d4eab5f20e0821071..cb6ecd65265d4cf3d49b3b3a6f701cb637bd4ea3
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -84,7 -84,8 +84,8 @@@ dccp_send fd user_list chunk_queue afs 
  playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
  http_recv dccp_recv recv_common write_common file_write audiod_command
  client_common recv stdout filter stdin audioc write client fsck exec send_common"
- all_executables="server recv filter audioc write client fsck afh amp_filter"
+ 
+ all_executables="server recv filter audioc write client fsck afh"
  
  recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
  recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
@@@ -336,7 -337,6 +337,6 @@@ if test "$have_ogg" = "yes"; the
  
        audiod_audio_formats="ogg"
        server_audio_formats="$server_audio_formats ogg"
-       filter_filters="$filter_filters oggdec"
        AC_SUBST(oggvorbis_cppflags)
        AC_SUBST(oggvorbis_libs)
  else
@@@ -369,7 -369,6 +369,6 @@@ if test "$have_faad" = "yes"; the
        all_errlist_objs="$all_errlist_objs aac_common aacdec aac_afh"
        filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
        afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
-       filter_filters="$filter_filters aacdec"
        audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
        server_errlist_objs="$server_errlist_objs aac_afh aac_common"
        server_ldflags="$server_ldflags $faad_libs -lfaad"
@@@ -706,15 -705,6 +705,15 @@@ AC_SUBST(fade_objs, add_dot_o($fade_obj
  AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
        objlist_to_errlist($fade_errlist_objs), errors used by para_fade)
  
 +
 +enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
 +AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
 +      enum of supported filters)
 +inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
 +AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
 +array="$(for i in $filters; do printf '{.name = \"'$i'\", .init = '$i'_filter_init},'; done)"
 +AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 +
  enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
  AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
@@@ -725,7 -715,6 +724,7 @@@ inits="$(for i in $writers; do printf '
  AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
  array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
  AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 +
  enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
  AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
        enum of audio formats supported by audiod)