From 89f53a102a54564f891171dc6ce3b93c0b003646 Mon Sep 17 00:00:00 2001
From: Watson Wheeler <git@tazy.dev>
Date: Thu, 2 Jul 2026 19:35:47 +1000
Subject: chore: fix merge conflict (iter 2)

---
 src/common.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/common.c b/src/common.c
index f9e46d5..40073d2 100644
--- a/src/common.c
+++ b/src/common.c
@@ -30,6 +30,8 @@ ff_ctx* ff_init(ff_allocator* allocator)
 
     ctx->allocator = *allocator;
 
+
+// TODO: Clean up this thread mess (doesn't just apply to this file only)
 #ifdef USE_THREAD
     /* initialize mutex used to protect ctx state */
     if (pthread_mutex_init(&ctx->ff_lock, NULL) != 0) {
-- 
cgit v1.2.3