RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Bug-Id: vlc/9665
(cherry picked from commit d1f9563d50)

Conflicts:
	libavcodec/pthread_frame.c
This commit is contained in:
Anton Khirnov 2014-02-27 21:36:33 +01:00 committed by Carl Eugen Hoyos
parent c7c724056e
commit 96603d5753
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread.c
View File

@ -902,8 +902,6 @@ void ff_thread_flush(AVCodecContext *avctx)
if (fctx->prev_thread) { if (fctx->prev_thread) {
if (fctx->prev_thread != &fctx->threads[0]) if (fctx->prev_thread != &fctx->threads[0])
update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 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; fctx->next_decoding = fctx->next_finished = 0;
@ -916,6 +914,9 @@ void ff_thread_flush(AVCodecContext *avctx)
av_frame_unref(p->frame); av_frame_unref(p->frame);
release_delayed_buffers(p); release_delayed_buffers(p);
if (avctx->codec->flush)
avctx->codec->flush(fctx->threads[0].avctx);
} }
} }