[FFmpeg-cvslog] avutil/executor: Fix missing check before using mutex
Zhao Zhili
git at videolan.org
Thu Jul 11 15:30:51 EEST 2024
ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Sun Jun 30 18:45:00 2024 +0800| [54f9469fa173394ef3a19d8c6e700bca0b8fde81] | committer: Nuo Mi
avutil/executor: Fix missing check before using mutex
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54f9469fa173394ef3a19d8c6e700bca0b8fde81
---
libavutil/executor.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavutil/executor.c b/libavutil/executor.c
index fb20104b58..89058fab2f 100644
--- a/libavutil/executor.c
+++ b/libavutil/executor.c
@@ -194,14 +194,17 @@ void av_executor_execute(AVExecutor *e, AVTask *t)
AVTaskCallbacks *cb = &e->cb;
AVTask **prev;
- ff_mutex_lock(&e->lock);
+ if (e->thread_count)
+ ff_mutex_lock(&e->lock);
if (t) {
for (prev = &e->tasks; *prev && cb->priority_higher(*prev, t); prev = &(*prev)->next)
/* nothing */;
add_task(prev, t);
}
- ff_cond_signal(&e->cond);
- ff_mutex_unlock(&e->lock);
+ if (e->thread_count) {
+ ff_cond_signal(&e->cond);
+ ff_mutex_unlock(&e->lock);
+ }
if (!e->thread_count || !HAVE_THREADS) {
// We are running in a single-threaded environment, so we must handle all tasks ourselves
More information about the ffmpeg-cvslog
mailing list