From d0cdce3646189775b3bd6f884669cad509201902 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 23 Sep 2018 10:19:58 +0200 Subject: Don’t use deprecated ffmpeg functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are now optional according to doc/APIchanges. Closes #670. --- src/player.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index ff1f1c9..16f5553 100644 --- a/src/player.c +++ b/src/player.c @@ -70,16 +70,19 @@ static void printError (const BarSettings_t * const settings, } /* global initialization - * - * XXX: in theory we can select the filters/formats we want to support, but - * this does not work in practise. */ void BarPlayerInit (player_t * const p, const BarSettings_t * const settings) { ao_initialize (); av_log_set_level (AV_LOG_FATAL); +#ifdef HAVE_AV_REGISTER_ALL av_register_all (); +#endif +#ifdef HAVE_AVFILTER_REGISTER_ALL avfilter_register_all (); +#endif +#ifdef HAVE_AVFORMAT_NETWORK_INIT avformat_network_init (); +#endif pthread_mutex_init (&p->lock, NULL); pthread_cond_init (&p->cond, NULL); @@ -95,7 +98,9 @@ void BarPlayerDestroy (player_t * const p) { pthread_cond_destroy (&p->aoplayCond); pthread_mutex_destroy (&p->aoplayLock); +#ifdef HAVE_AVFORMAT_NETWORK_INIT avformat_network_deinit (); +#endif ao_shutdown (); } -- cgit v1.2.3