diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index fdbaa28a97..b7ad29a081 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -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;