1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00

hevc: delay ff_thread_finish_setup for hwaccel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 31816eae32)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Rainer Hochecker 2015-03-12 14:08:25 +01:00 committed by Michael Niedermayer
parent 5e84ab838c
commit ea52c0614c

View 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;