virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/h264dec: make sure a slice is decoded before finishing setup

Browse Source 
Fixes regression in fate-h264-attachment-631 with THREADS=8 introduced
by bdbbb8f11e.
This commit is contained in:
Matthieu Bouron
2017-01-20 17:24:52 +01:00
parent 8869f5efec
commit 639e262971
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264dec.c
View File

@@ -679,13 +679,13 @@ again:
if (sl->redundant_pic_count > 0) if (sl->redundant_pic_count > 0)
break; break;
if (h->current_slice == 1) {
if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel &&
i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) {
ff_thread_finish_setup(avctx); ff_thread_finish_setup(avctx);
h->setup_finished = 1; h->setup_finished = 1;
} }
if (h->current_slice == 1) {
if (h->avctx->hwaccel && if (h->avctx->hwaccel &&
(ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0) (ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0)
goto end; goto end;