hevc: delay ff_thread_finish_setup for hwaccel
authorRainer Hochecker <fernetmenta@online.de>
Thu, 12 Mar 2015 13:08:25 +0000 (14:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 13:49:41 +0000 (14:49 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c

index fdbaa28..b7ad29a 100644 (file)
@@ -2600,7 +2600,8 @@ static int hevc_frame_start(HEVCContext *s)
     if (ret < 0)
         goto fail;
 
-    ff_thread_finish_setup(s->avctx);
+    if (!s->avctx->hwaccel)
+        ff_thread_finish_setup(s->avctx);
 
     return 0;