[FFmpeg-cvslog] Revert "pthread: flush all threads on flush, not just the first one"

[Anton Khirnov]

ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Thu Apr 24 07:40:34 2014 +0200| [cf7bb6ceb1da7682aa54989f83d81c67a5e6790d] | committer: Anton Khirnov

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7bb6ceb1da7682aa54989f83d81c67a5e6790d
---

 libavcodec/pthread.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index d0c92f4..8ae494b 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);
     }
 }