Commit 55ed91c8 authored by Clément Bœsch's avatar Clément Bœsch

threads: fix a potential race spotted by helgrind.

parent 652887d6
...@@ -975,9 +975,9 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f) ...@@ -975,9 +975,9 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)
avctx->get_buffer == avcodec_default_get_buffer) { avctx->get_buffer == avcodec_default_get_buffer) {
err = avctx->get_buffer(avctx, f); err = avctx->get_buffer(avctx, f);
} else { } else {
pthread_mutex_lock(&p->progress_mutex);
p->requested_frame = f; p->requested_frame = f;
p->state = STATE_GET_BUFFER; p->state = STATE_GET_BUFFER;
pthread_mutex_lock(&p->progress_mutex);
pthread_cond_broadcast(&p->progress_cond); pthread_cond_broadcast(&p->progress_cond);
while (p->state != STATE_SETTING_UP) while (p->state != STATE_SETTING_UP)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment