ffmpeg | branch: master | Matthieu Bouron <[email protected]> | Fri Jan 20 17:24:52 2017 +0100| [639e26297147866534c093fd39f89fe386d81ebd] | committer: Matthieu Bouron
lavc/h264dec: make sure a slice is decoded before finishing setup Fixes regression in fate-h264-attachment-631 with THREADS=8 introduced by bdbbb8f11edbf10add874508c5125c174d8939be. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=639e26297147866534c093fd39f89fe386d81ebd --- libavcodec/h264dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index c24818b..f18fb0b 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -679,13 +679,13 @@ again: if (sl->redundant_pic_count > 0) break; + if (h->current_slice == 1) { if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { ff_thread_finish_setup(avctx); h->setup_finished = 1; } - if (h->current_slice == 1) { if (h->avctx->hwaccel && (ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0) goto end; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
