Merge commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb' into release/1.1

* commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb':
  pthread: flush all threads on flush, not just the first one

Merged-by: Michael Niedermayer <[email protected]>

1 files changed, 3 insertions, 2 deletions

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 20398302f7..4a79e538af 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -908,8 +908,6 @@ 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;
@@ -921,6 +919,9 @@ void ff_thread_flush(AVCodecContext *avctx)
         p->got_frame = 0;
 
         release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(p->avctx);
     }
 }