[SCM] libav/master: pthread: flush all threads on flush, not just the first one
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun May 4 21:36:32 UTC 2014
The following commit has been merged in the master branch:
commit 2eb15cdeef29eb8a0a32658154decba94b4b89cb
Author: Diego Biurrun <diego at biurrun.de>
Date: Wed Feb 19 20:33:28 2014 +0100
pthread: 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.
CC:libav-stable at libav.org
Bug-Id: vlc/9665
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 8ae494b..d0c92f4 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -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);
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list