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

[Anton Khirnov]

ffmpeg | branch: release/2.1 | Anton Khirnov <anton at khirnov.net> | Thu Feb 27 21:36:33 2014 +0100| [96603d5753c765c662a348b91a8e6d30226de700] | committer: Carl Eugen Hoyos

pthread_frame: flush all threads on flush, not just the first one

avcodec_flush_buffers() must release all internally held references
according to its documentation, for which all the threads need to be
flushed.

Bug-Id: vlc/9665
(cherry picked from commit d1f9563d502037239185c11578cc614bdf0c5870)

Conflicts:
	libavcodec/pthread_frame.c

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

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

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 6cf51c8..cdbe729 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -902,8 +902,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;
@@ -916,6 +914,9 @@ void ff_thread_flush(AVCodecContext *avctx)
         av_frame_unref(p->frame);
 
         release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(fctx->threads[0].avctx);
     }
 }