MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-26 04:26:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

[main/transcode] Fix some libav compability + log what ffmpeg/libav we are using

Browse Source
This commit is contained in:
ejurgensen
2017-09-16 23:01:42 +02:00
parent 7cc9a8b02b
commit eec98e3b7e
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@@ -49,6 +49,7 @@
#ifdef HAVE_LIBEVENT_PTHREADS
# include <event2/thread.h>
#endif
#include <libavutil/avutil.h>
#include <libavutil/log.h>
#include <libavformat/avformat.h>
#include <libavfilter/avfilter.h>
@@ -466,6 +467,7 @@ main(int argc, char **argv)
char *ffid;
char *pidfile;
char **buildopts;
const char *av_version;
const char *gcry_version;
sigset_t sigs;
int sigfd;
@@ -599,6 +601,18 @@ main(int argc, char **argv)
DPRINTF(E_LOG, L_MAIN, "- %s\n", buildopts[i]);
}
#if HAVE_DECL_AV_VERSION_INFO
av_version = av_version_info();
#else
av_version = "(unknown version)";
#endif
#ifdef HAVE_FFMPEG
DPRINTF(E_INFO, L_MAIN, "Initialized with ffmpeg %s\n", av_version);
#else
DPRINTF(E_INFO, L_MAIN, "Initialized with libav %s\n", av_version);
#endif
ret = av_lockmgr_register(ffmpeg_lockmgr);
if (ret < 0)
{
@@ -610,7 +624,7 @@ main(int argc, char **argv)
av_register_all();
avfilter_register_all();
#if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 13)
#if HAVE_DECL_AVFORMAT_NETWORK_INIT
avformat_network_init();
#endif
av_log_set_callback(logger_ffmpeg);
@@ -916,7 +930,7 @@ main(int argc, char **argv)
#ifdef HAVE_LIBCURL
curl_global_cleanup();
#endif
#if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 13)
#if HAVE_DECL_AVFORMAT_NETWORK_INIT
avformat_network_deinit();
#endif
av_lockmgr_register(NULL);