mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'
* commit 'd1f9563d502037239185c11578cc614bdf0c5870': pthread_frame: flush all threads on flush, not just the first one Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a22907e9ea
|
@ -727,8 +727,6 @@ void ff_thread_flush(AVCodecContext *avctx)
|
||||||
if (fctx->prev_thread) {
|
if (fctx->prev_thread) {
|
||||||
if (fctx->prev_thread != &fctx->threads[0])
|
if (fctx->prev_thread != &fctx->threads[0])
|
||||||
update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 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;
|
fctx->next_decoding = fctx->next_finished = 0;
|
||||||
|
@ -741,6 +739,9 @@ void ff_thread_flush(AVCodecContext *avctx)
|
||||||
av_frame_unref(p->frame);
|
av_frame_unref(p->frame);
|
||||||
|
|
||||||
release_delayed_buffers(p);
|
release_delayed_buffers(p);
|
||||||
|
|
||||||
|
if (avctx->codec->flush)
|
||||||
|
avctx->codec->flush(p->avctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue