Merge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:30:42 +0000 (22:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:30:54 +0000 (22:30 +0100)
* commit '1d1df82093fdacb2cbc443c70c80f8f801002d28':
  pthread_frame: flush all threads on flush, not just the first one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pthread_frame.c

index 42a3c9b..d7479d2 100644 (file)
@@ -727,8 +727,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;
@@ -741,6 +739,9 @@ void ff_thread_flush(AVCodecContext *avctx)
         av_frame_unref(p->frame);
 
         release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(p->avctx);
     }
 }