Merge branch 'v0.16.x'
Conflicts: Makefile.am NEWS configure.ac src/encoder/flac_encoder.c src/log.c src/pcm_buffer.c
This commit is contained in:
+7
-3
@@ -84,7 +84,6 @@ mpd_headers = \
|
||||
src/encoder_api.h \
|
||||
src/exclude.h \
|
||||
src/fd_util.h \
|
||||
src/fifo_buffer.h \
|
||||
src/glib_compat.h \
|
||||
src/update.h \
|
||||
src/update_internal.h \
|
||||
@@ -258,7 +257,8 @@ src_mpd_SOURCES = \
|
||||
src/dirvec.c \
|
||||
src/exclude.c \
|
||||
src/fd_util.c \
|
||||
src/fifo_buffer.c \
|
||||
src/fifo_buffer.c src/fifo_buffer.h \
|
||||
src/growing_fifo.c src/growing_fifo.h \
|
||||
src/filter_config.c \
|
||||
src/filter_plugin.c \
|
||||
src/filter_registry.c \
|
||||
@@ -1035,6 +1035,9 @@ test_run_decoder_SOURCES = test/run_decoder.c \
|
||||
src/audio_check.c \
|
||||
src/audio_format.c \
|
||||
src/timer.c \
|
||||
$(ARCHIVE_SRC) \
|
||||
$(INPUT_SRC) \
|
||||
$(TAG_SRC) \
|
||||
$(DECODER_SRC)
|
||||
|
||||
test_read_tags_LDADD = \
|
||||
@@ -1093,6 +1096,7 @@ if ENABLE_ENCODER
|
||||
noinst_PROGRAMS += test/run_encoder
|
||||
test_run_encoder_SOURCES = test/run_encoder.c \
|
||||
test/stdbin.h \
|
||||
src/fifo_buffer.c src/growing_fifo.c \
|
||||
src/conf.c src/tokenizer.c \
|
||||
src/utils.c src/string_util.c \
|
||||
src/tag.c src/tag_pool.c \
|
||||
@@ -1148,7 +1152,7 @@ test_run_output_SOURCES = test/run_output.c \
|
||||
src/audio_parser.c \
|
||||
src/timer.c \
|
||||
src/tag.c src/tag_pool.c \
|
||||
src/fifo_buffer.c \
|
||||
src/fifo_buffer.c src/growing_fifo.c \
|
||||
src/page.c \
|
||||
src/socket_util.c \
|
||||
src/resolver.c \
|
||||
|
||||
Reference in New Issue
Block a user