GitList

Browse code

hevc: delay ff_thread_finish_setup for hwaccel

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Rainer Hochecker authored on 2015/03/12 22:08:25
Showing 1 changed files

libavcodec/hevc.c index fdbaa28..b7ad29a 100644

libavcodec/hevc.c

History View file @ ea52c06

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