Merge branch 'v0.16.x'
Conflicts: src/cmdline.c src/decoder/wildmidi_decoder_plugin.c src/gcc.h src/glib_compat.h src/input_stream.c src/output_list.c src/output_thread.c valgrind.suppressions
This commit is contained in:
+8
-5
@@ -20,10 +20,16 @@
|
||||
#ifndef MPD_ENCODER_LIST_H
|
||||
#define MPD_ENCODER_LIST_H
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
struct encoder_plugin;
|
||||
|
||||
extern const struct encoder_plugin *const encoder_plugins[];
|
||||
|
||||
#define encoder_plugins_for_each(plugin) \
|
||||
for (const struct encoder_plugin *plugin, \
|
||||
*const*encoder_plugin_iterator = &encoder_plugins[0]; \
|
||||
(plugin = *encoder_plugin_iterator) != NULL; \
|
||||
++encoder_plugin_iterator)
|
||||
|
||||
/**
|
||||
* Looks up an encoder plugin by its name.
|
||||
*
|
||||
@@ -34,7 +40,4 @@ struct encoder_plugin;
|
||||
const struct encoder_plugin *
|
||||
encoder_plugin_get(const char *name);
|
||||
|
||||
void
|
||||
encoder_plugin_print_all_types(FILE * fp);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user