]> granicus.if.org Git - handbrake/commitdiff
libhb: eliminate use of deprecated ffmpeg lockmgr
authorJohn Stebbins <jstebbins.hb@gmail.com>
Wed, 13 Jun 2018 15:07:23 +0000 (08:07 -0700)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Wed, 13 Jun 2018 15:07:23 +0000 (08:07 -0700)
It's a NOP and does nothing in current code

libhb/hb.c

index a0d1b7291e8e966d4f1898d82e73fa8a49d3ad39..b46da5f68487e430798892fd934635a476100f1e 100644 (file)
@@ -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