highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2

Browse Source 
* commit '1d1df82093fdacb2cbc443c70c80f8f801002d28':
  pthread_frame: flush all threads on flush, not just the first one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-03 22:30:42 +01:00
parent 8ad2f45964 1d1df82093
commit c4149c4d54
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread_frame.c
View File

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