diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-01-20 17:24:52 +0100 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-01-20 17:28:40 +0100 |
| commit | 639e26297147866534c093fd39f89fe386d81ebd (patch) | |
| tree | 2c48eea2351cb60cb1aa82c31c7d88a7e6d70cbf | |
| parent | 8869f5efecb65ed7aedc67acf1bafd97aa40b9b7 (diff) | |
| download | ffmpeg-639e26297147866534c093fd39f89fe386d81ebd.tar.gz | |
lavc/h264dec: make sure a slice is decoded before finishing setup
Fixes regression in fate-h264-attachment-631 with THREADS=8 introduced
by bdbbb8f11edbf10add874508c5125c174d8939be.
| -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 c24818bde4..f18fb0b765 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; |