diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-02-27 21:36:33 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-02 11:42:36 -0500 |
| commit | 1d1df82093fdacb2cbc443c70c80f8f801002d28 (patch) | |
| tree | 239b53d89ef411cee42e7905f83b93d6ac4c94f2 | |
| parent | de187e3e9ec4803575deb1c293ccad84d2a88da8 (diff) | |
| download | ffmpeg-1d1df82093fdacb2cbc443c70c80f8f801002d28.tar.gz | |
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.
CC:libav-stable@libav.org
Bug-Id: vlc/9665
(cherry picked from commit d1f9563d502037239185c11578cc614bdf0c5870)
| -rw-r--r-- | libavcodec/pthread_frame.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 36b4fff0bb..1af8ff5c94 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -672,8 +672,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; @@ -686,6 +684,9 @@ void ff_thread_flush(AVCodecContext *avctx) av_frame_unref(p->frame); release_delayed_buffers(p); + + if (avctx->codec->flush) + avctx->codec->flush(p->avctx); } } |