virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vp8/mt: flush worker thread, not application thread context, on seek.

Browse Source 
This prevents a crash when seeking.
This commit is contained in:
Ronald S. Bultje 2011-07-10 21:23:09 -07:00
parent 5eafc8b466
commit d1cf459119
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/pthread.c
View File

@ -747,9 +747,12 @@ void ff_thread_flush(AVCodecContext *avctx)
if (!avctx->thread_opaque) return; if (!avctx->thread_opaque) return;
park_frame_worker_threads(fctx, avctx->thread_count); park_frame_worker_threads(fctx, avctx->thread_count);
if (fctx->prev_thread) {
if (fctx->prev_thread) if (fctx->prev_thread != &fctx->threads[0])
update_context_from_thread(fctx->threads->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;
fctx->delaying = 1; fctx->delaying = 1;

2
libavcodec/utils.c
View File

@ -1080,7 +1080,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
{ {
if(HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME) if(HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME)
ff_thread_flush(avctx); ff_thread_flush(avctx);
if(avctx->codec->flush) else if(avctx->codec->flush)
avctx->codec->flush(avctx); avctx->codec->flush(avctx);
} }