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

Revert "pthread: flush all threads on flush, not just the first one"

Browse Source 
This reverts commit 2eb15cdeef.

It does not work correctly in pre-refcounting threading code.
This commit is contained in:
Anton Khirnov
2014-04-24 07:40:34 +02:00
parent ce364088ef
commit cf7bb6ceb1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread.c
View File

@@ -885,6 +885,8 @@ 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;
@@ -896,9 +898,6 @@ 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);
} }
} }