[SCM] libav/master: Revert "pthread: flush all threads on flush, not just the first one"

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cf7bb6ceb1da7682aa54989f83d81c67a5e6790d
Author: Anton Khirnov <anton at khirnov.net>
Date:   Thu Apr 24 07:40:34 2014 +0200

    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.

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);
     }
 }
 

-- 
Libav/FFmpeg packaging