Merge branch 'v0.16.x'
Conflicts: src/decoder/ffmpeg_decoder_plugin.c test/read_tags.c test/run_decoder.c
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#include "io_thread.h"
|
||||
#include "decoder_list.h"
|
||||
#include "decoder_api.h"
|
||||
#include "tag_pool.h"
|
||||
#include "input_init.h"
|
||||
#include "input_stream.h"
|
||||
#include "audio_format.h"
|
||||
@@ -190,6 +191,8 @@ int main(int argc, char **argv)
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
tag_pool_init();
|
||||
|
||||
if (!input_stream_global_init(&error)) {
|
||||
g_warning("%s", error->message);
|
||||
g_error_free(error);
|
||||
@@ -245,5 +248,7 @@ int main(int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
tag_pool_deinit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user