diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-04-24 07:40:34 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-04-24 07:46:48 +0200 |
commit | cf7bb6ceb1da7682aa54989f83d81c67a5e6790d (patch) | |
tree | 014ac80d2a2b718dfd518d5276403fb897a3d4dd | |
parent | ce364088ef53dbaf90e74a471d12b732b697e0cd (diff) | |
download | ffmpeg-cf7bb6ceb1da7682aa54989f83d81c67a5e6790d.tar.gz |
Revert "pthread: flush all threads on flush, not just the first one"
This reverts commit 2eb15cdeef29eb8a0a32658154decba94b4b89cb.
It does not work correctly in pre-refcounting threading code.
-rw-r--r-- | libavcodec/pthread.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index d0c92f4f82..8ae494b0b5 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -885,6 +885,8 @@ void ff_thread_flush(AVCodecContext *avctx) 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; @@ -896,9 +898,6 @@ void ff_thread_flush(AVCodecContext *avctx) p->got_frame = 0; release_delayed_buffers(p); - - if (avctx->codec->flush) - avctx->codec->flush(p->avctx); } } |