highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pthread_frame: flush all threads on flush, not just the first one

Browse Source 
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
This commit is contained in:
Anton Khirnov 2014-02-27 21:36:33 +01:00 committed by Carl Eugen Hoyos
parent 89c917fcd9
commit 2256b2a3c1
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

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