diff --git a/deps/libff/libff/ff-demuxer.c b/deps/libff/libff/ff-demuxer.c
index 55ee3b9ee..5ad2a7038 100644
--- a/deps/libff/libff/ff-demuxer.c
+++ b/deps/libff/libff/ff-demuxer.c
@@ -251,8 +251,11 @@ static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream)
 	// > 1
 	codec_context->refcounted_frames = 1;
 
-	// png decoder has serious issues with multiple threads
-	if (codec_context->codec_id == AV_CODEC_ID_PNG)
+	// png/tiff decoders have serious issues with multiple threads
+	if (codec_context->codec_id == AV_CODEC_ID_PNG
+			|| codec_context->codec_id == AV_CODEC_ID_TIFF
+			|| codec_context->codec_id == AV_CODEC_ID_JPEG2000
+			|| codec_context->codec_id == AV_CODEC_ID_WEBP)
 		codec_context->thread_count = 1;
 
 	if (demuxer->options.is_hw_decoding) {