diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-19 20:33:28 +0100 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2014-04-14 18:09:09 -0400 |
| commit | 2eb15cdeef29eb8a0a32658154decba94b4b89cb (patch) | |
| tree | 8c319609cec503556c06ebb43576061b3fffaaef /libavcodec | |
| parent | b701e26a4e89e3816490bc74bc47f82e6b7f7002 (diff) | |
| download | ffmpeg-2eb15cdeef29eb8a0a32658154decba94b4b89cb.tar.gz | |
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@libav.org
Bug-Id: vlc/9665
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 8ae494b0b5..d0c92f4f82 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); } } |