|
@@ -747,9 +747,12 @@ void ff_thread_flush(AVCodecContext *avctx)
|
|
|
if (!avctx->thread_opaque) return;
|
|
|
|
|
|
park_frame_worker_threads(fctx, avctx->thread_count);
|
|
|
-
|
|
|
- if (fctx->prev_thread)
|
|
|
- update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0);
|
|
|
+ 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;
|
|
|
fctx->delaying = 1;
|