diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-12-03 17:21:40 +0300 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-03-21 08:16:49 +0300 |
| commit | 14bb15bfd56d6e907fabe4620206c1ee152b7a20 (patch) | |
| tree | 38e19eed9e77d3555c146517161c5c45a67de5fd /libavcodec/h264dec.c | |
| parent | c358c62550e60a150c49f192d72631142a6eedd6 (diff) | |
pthread_frame: ensure the threads don't run simultaneously with hwaccel
Merges Libav commit 8dfba25c.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Diffstat (limited to 'libavcodec/h264dec.c')
| -rw-r--r-- | libavcodec/h264dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 9042169338..585ce86f37 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -681,7 +681,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) } if (h->current_slice == 1) { - if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && + if (avctx->active_thread_type & FF_THREAD_FRAME && i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { ff_thread_finish_setup(avctx); h->setup_finished = 1; |