From: John Stebbins Date: Wed, 13 Jun 2018 15:07:23 +0000 (-0700) Subject: libhb: eliminate use of deprecated ffmpeg lockmgr X-Git-Tag: 1.2.0~319 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9639180446008034ba5429d5a23262d86bc7e102;p=handbrake libhb: eliminate use of deprecated ffmpeg lockmgr It's a NOP and does nothing in current code --- diff --git a/libhb/hb.c b/libhb/hb.c index a0d1b7291..b46da5f68 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -71,35 +71,8 @@ int hb_instance_counter = 0; static void thread_func( void * ); -static int ff_lockmgr_cb(void **mutex, enum AVLockOp op) -{ - switch ( op ) - { - case AV_LOCK_CREATE: - { - *mutex = hb_lock_init(); - } break; - case AV_LOCK_DESTROY: - { - hb_lock_close( (hb_lock_t**)mutex ); - } break; - case AV_LOCK_OBTAIN: - { - hb_lock( (hb_lock_t*)*mutex ); - } break; - case AV_LOCK_RELEASE: - { - hb_unlock( (hb_lock_t*)*mutex ); - } break; - default: - break; - } - return 0; -} - void hb_avcodec_init() { - av_lockmgr_register(ff_lockmgr_cb); av_register_all(); avfilter_register_all(); #ifdef _WIN64