Commit a22907e9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd1f9563d'

* commit 'd1f9563d':
  pthread_frame: flush all threads on flush, not just the first one
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f0ce3854 d1f9563d
......@@ -727,8 +727,6 @@ void ff_thread_flush(AVCodecContext *avctx)
if (fctx->prev_thread) {
if (fctx->prev_thread != &fctx->threads[0])
update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 0);
if (avctx->codec->flush)
avctx->codec->flush(fctx->threads[0].avctx);
}
fctx->next_decoding = fctx->next_finished = 0;
......@@ -741,6 +739,9 @@ void ff_thread_flush(AVCodecContext *avctx)
av_frame_unref(p->frame);
release_delayed_buffers(p);
if (avctx->codec->flush)
avctx->codec->flush(p->avctx);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment