Browse Source

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

Fixes regression in fate-h264-attachment-631 with THREADS=8 introduced
by bdbbb8f11e.
tags/n3.3
Matthieu Bouron 9 years ago
parent
commit
639e262971
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/h264dec.c

+ 1
- 1
libavcodec/h264dec.c View File

@@ -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;


Loading…
Cancel
Save