generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb' into release/1.1

Browse Source 
* commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb':
  pthread: 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-04-21 16:25:21 +02:00
parent fa73d13678 2eb15cdeef
commit 0162ad1a59
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread.c
View File

@@ -908,8 +908,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;
@@ -921,6 +919,9 @@ void ff_thread_flush(AVCodecContext *avctx)
p->got_frame = 0; p->got_frame = 0;
release_delayed_buffers(p); release_delayed_buffers(p);
if (avctx->codec->flush)
avctx->codec->flush(p->avctx);
} }
} }