diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-12-03 15:21:40 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-12-19 08:09:19 +0100 |
| commit | 8dfba25ce89b62c80ba83e2116d549176c376144 (patch) | |
| tree | 27f99402214fd3c49b82690e4c2850b2e05fe08e /libavcodec/h264dec.c | |
| parent | 373fd76b4dbd9aa03ed28e502f33f2ca8c1ce19a (diff) | |
pthread_frame: ensure the threads don't run simultaneously with hwaccel
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 330a74dcb4..83b3ab3be1 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -573,7 +573,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) if ((err = ff_h264_queue_decode_slice(h, nal))) break; - 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; |