Merge commit 'meins/next'

diff --combined Makefile.in
index 2f903d0c4038f09a225598dff59e9c42976a7a2d,8ac8b65b92c66bb1eafed423c21a6c3975ee6e92..9e60b0df1f399b94bc1c90c7915366bb083fa970
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -12,7 -12,7 +12,7 @@@ build_date := $(shell date
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
  uname_rs := $(shell uname -rs)
  cc_version := $(shell $(CC) --version | head -n 1)
 -codename := axiomatic perspectivity
 +codename := elliptic inheritance
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls
@@@ -161,15 -161,15 +161,15 @@@ ortp_recv.o: ortp_recv.
  ortp_send.o: ortp_send.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
  
- oggdec.o: oggdec.c
+ oggdec_filter.o: oggdec_filter.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
  ogg_afh.o: ogg_afh.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
  
- mp3dec.o: mp3dec.c
+ mp3dec_filter.o: mp3dec_filter.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
  
- aacdec.o: aacdec.c
+ aacdec_filter.o: aacdec_filter.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
  
  aac_common.o: aac_common.c