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

[main] Conditionally disable functions deprecated by ffmpeg 4.0

Browse Source 
av_register_all, av_lockmgr_register and avfilter_register_all
This commit is contained in:
ejurgensen 2019-07-03 20:29:31 +02:00
parent a321667201
commit 528a175d99
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.c
View File

@ -446,7 +446,7 @@ signal_kqueue_cb(int fd, short event, void *arg)
} }
#endif #endif
#if (LIBAVCODEC_VERSION_MAJOR < 58) || ((LIBAVCODEC_VERSION_MAJOR == 58) && (LIBAVCODEC_VERSION_MINOR < 18))
static int static int
ffmpeg_lockmgr(void **pmutex, enum AVLockOp op) ffmpeg_lockmgr(void **pmutex, enum AVLockOp op)
{ {
@ -477,6 +477,7 @@ ffmpeg_lockmgr(void **pmutex, enum AVLockOp op)
return 1; return 1;
} }
#endif
int int
main(int argc, char **argv) main(int argc, char **argv)
@ -660,6 +661,8 @@ main(int argc, char **argv)
DPRINTF(E_INFO, L_MAIN, "Initialized with libav %s\n", av_version); DPRINTF(E_INFO, L_MAIN, "Initialized with libav %s\n", av_version);
#endif #endif
// The following was deprecated with ffmpeg 4.0 = avcodec 58.18, avformat 58.12, avfilter 7.16
#if (LIBAVCODEC_VERSION_MAJOR < 58) || ((LIBAVCODEC_VERSION_MAJOR == 58) && (LIBAVCODEC_VERSION_MINOR < 18))
ret = av_lockmgr_register(ffmpeg_lockmgr); ret = av_lockmgr_register(ffmpeg_lockmgr);
if (ret < 0) if (ret < 0)
{ {
@ -668,9 +671,14 @@ main(int argc, char **argv)
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
goto ffmpeg_init_fail; goto ffmpeg_init_fail;
} }
#endif
#if (LIBAVFORMAT_VERSION_MAJOR < 58) || ((LIBAVFORMAT_VERSION_MAJOR == 58) && (LIBAVFORMAT_VERSION_MINOR < 12))
av_register_all(); av_register_all();
#endif
#if (LIBAVFILTER_VERSION_MAJOR < 7) || ((LIBAVFILTER_VERSION_MAJOR == 7) && (LIBAVFILTER_VERSION_MINOR < 16))
avfilter_register_all(); avfilter_register_all();
#endif
#if HAVE_DECL_AVFORMAT_NETWORK_INIT #if HAVE_DECL_AVFORMAT_NETWORK_INIT
avformat_network_init(); avformat_network_init();
#endif #endif
@ -985,9 +993,12 @@ main(int argc, char **argv)
#if HAVE_DECL_AVFORMAT_NETWORK_INIT #if HAVE_DECL_AVFORMAT_NETWORK_INIT
avformat_network_deinit(); avformat_network_deinit();
#endif #endif
av_lockmgr_register(NULL);
#if (LIBAVCODEC_VERSION_MAJOR < 58) || ((LIBAVCODEC_VERSION_MAJOR == 58) && (LIBAVCODEC_VERSION_MINOR < 18))
av_lockmgr_register(NULL);
ffmpeg_init_fail: ffmpeg_init_fail:
#endif
DPRINTF(E_LOG, L_MAIN, "Exiting.\n"); DPRINTF(E_LOG, L_MAIN, "Exiting.\n");
conffile_unload(); conffile_unload();
logger_deinit(); logger_deinit();