Commit e89cefb4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

audio_mixer: remove recursion

parent 9d1bb3e8
...@@ -4189,7 +4189,6 @@ AC_CONFIG_FILES([ ...@@ -4189,7 +4189,6 @@ AC_CONFIG_FILES([
modules/access/rtp/Makefile modules/access/rtp/Makefile
modules/access_output/Makefile modules/access_output/Makefile
modules/audio_filter/Makefile modules/audio_filter/Makefile
modules/audio_mixer/Makefile
modules/control/Makefile modules/control/Makefile
modules/gui/Makefile modules/gui/Makefile
modules/gui/macosx/Makefile modules/gui/macosx/Makefile
......
...@@ -4,7 +4,6 @@ noinst_HEADERS = ...@@ -4,7 +4,6 @@ noinst_HEADERS =
BASE_SUBDIRS = \ BASE_SUBDIRS = \
access/rtp \ access/rtp \
audio_filter \ audio_filter \
audio_mixer \
control \ control \
gui \ gui \
misc \ misc \
...@@ -42,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST ...@@ -42,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST
include common.am include common.am
include access/Makefile.am include access/Makefile.am
include arm_neon/Makefile.am include arm_neon/Makefile.am
include audio_mixer/Makefile.am
include audio_output/Makefile.am include audio_output/Makefile.am
include codec/Makefile.am include codec/Makefile.am
include demux/Makefile.am include demux/Makefile.am
......
include $(top_srcdir)/modules/common.am
audio_mixerdir = $(pluginsdir)/audio_mixer audio_mixerdir = $(pluginsdir)/audio_mixer
libfloat_mixer_plugin_la_SOURCES = float.c libfloat_mixer_plugin_la_SOURCES = audio_mixer/float.c
libfloat_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libfloat_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libfloat_mixer_plugin_la_LIBADD = $(LIBM) libfloat_mixer_plugin_la_LIBADD = $(LIBM)
libinteger_mixer_plugin_la_SOURCES = integer.c libinteger_mixer_plugin_la_SOURCES = audio_mixer/integer.c
libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
audio_mixer_LTLIBRARIES = \ audio_mixer_LTLIBRARIES = \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment