From c2dff2428f10d8521f37923f728686483176870b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Date: Mon, 21 Apr 2025 19:01:57 +0200 Subject: [PATCH 2/5] tools/target_dec_fuzzer: Remove mjpeg hack ff_mjpeg_decoder is now referenced directly by the relevant decoders, so that the linker sees the dependency and just does the desired thing. So remove the hack. (Btw: The preprocessor does not do string comparisons, instead undefined tokens in #if checks evaluate to 0, making the check true regardless of the actual codec fuzzed (and leading to linker errors if the mjpeg decoder is disabled).) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tools/target_dec_fuzzer.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index b3be69f94d..2a8f39cb34 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -193,11 +193,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { extern FFCodec DECODER_SYMBOL(FFMPEG_DECODER); codec_list[0] = &DECODER_SYMBOL(FFMPEG_DECODER); -#if FFMPEG_DECODER == tiff || FFMPEG_DECODER == tdsc - extern FFCodec DECODER_SYMBOL(mjpeg); - codec_list[1] = &DECODER_SYMBOL(mjpeg); -#endif - c = &DECODER_SYMBOL(FFMPEG_DECODER); #else c = AVCodecInitialize(FFMPEG_CODEC); // Done once. -- 2.45.2