pthread_frame: flush all threads on flush, not just the first one
authorAnton Khirnov <anton@khirnov.net>
Thu, 27 Feb 2014 20:36:33 +0000 (21:36 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 4 Mar 2014 00:39:11 +0000 (01:39 +0100)
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

libavcodec/pthread.c

index 1ca72b4..7a57c2e 100644 (file)
@@ -912,8 +912,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;
@@ -925,6 +923,9 @@ void ff_thread_flush(AVCodecContext *avctx)
         p->got_frame = 0;
 
         release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(fctx->threads[0].avctx);
     }
 }