Revert "pthread: flush all threads on flush, not just the first one"
authorAnton Khirnov <anton@khirnov.net>
Thu, 24 Apr 2014 05:40:34 +0000 (07:40 +0200)
committerAnton Khirnov <anton@khirnov.net>
Thu, 24 Apr 2014 05:46:48 +0000 (07:46 +0200)
This reverts commit 2eb15cdeef29eb8a0a32658154decba94b4b89cb.

It does not work correctly in pre-refcounting threading code.

libavcodec/pthread.c

index d0c92f4..8ae494b 100644 (file)
@@ -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);
     }
 }