pthread: flush all threads on flush, not just the first one
authorDiego Biurrun <diego@biurrun.de>
Wed, 19 Feb 2014 19:33:28 +0000 (20:33 +0100)
committerSean McGovern <gseanmcg@gmail.com>
Mon, 14 Apr 2014 22:09:09 +0000 (18:09 -0400)
avcodec_flush_buffers() must release all internally held references
according to its documentation, for which all the threads need to be
flushed.

CC:libav-stable@libav.org
Bug-Id: vlc/9665

libavcodec/pthread.c

index 8ae494b..d0c92f4 100644 (file)
@@ -885,8 +885,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;
@@ -898,6 +896,9 @@ void ff_thread_flush(AVCodecContext *avctx)
         p->got_frame = 0;
 
         release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(p->avctx);
     }
 }