har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/pthread_frame: protect read state access in setup finish function

Browse Source
This commit is contained in:
Clément Bœsch 2017-01-11 17:10:07 +01:00
parent 591be9e384
commit a91c265f39
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pthread_frame.c
View File

@ -509,11 +509,11 @@ void ff_thread_finish_setup(AVCodecContext *avctx) {
if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return; if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return;
pthread_mutex_lock(&p->progress_mutex);
if(p->state == STATE_SETUP_FINISHED){ if(p->state == STATE_SETUP_FINISHED){
av_log(avctx, AV_LOG_WARNING, "Multiple ff_thread_finish_setup() calls\n"); av_log(avctx, AV_LOG_WARNING, "Multiple ff_thread_finish_setup() calls\n");
} }
pthread_mutex_lock(&p->progress_mutex);
p->state = STATE_SETUP_FINISHED; p->state = STATE_SETUP_FINISHED;
pthread_cond_broadcast(&p->progress_cond); pthread_cond_broadcast(&p->progress_cond);
pthread_mutex_unlock(&p->progress_mutex); pthread_mutex_unlock(&p->progress_mutex);