avformat/mpegtsenc: simplify code for condition checks

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 4bf1dfedcfc0e19a8639d5b0535774106415b769..45a22b0cb3c89a870d8394a6f7ac2874e74356ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,12 @@ $(TOOLS): %$(EXESUF): %.o
 target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
        $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
 
+tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS)
+       $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+
+tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
+       $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+
 tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
 tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
@@ -135,7 +141,7 @@ uninstall-data:
 
 clean::
        $(RM) $(CLEANSUFFIXES)
-       $(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
+       $(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
        $(RM) -r coverage-html
        $(RM) -rf coverage.info coverage.info.in lcov
 
@@ -145,6 +151,7 @@ distclean:: clean
                version.h libavutil/ffversion.h libavcodec/codec_names.h \
                libavcodec/bsf_list.c libavformat/protocol_list.c \
                libavcodec/codec_list.c libavcodec/parser_list.c \
+               libavfilter/filter_list.c libavdevice/indev_list.c libavdevice/outdev_list.c \
                libavformat/muxer_list.c libavformat/demuxer_list.c
 ifeq ($(SRC_LINK),src)
        $(RM) src
@@ -159,7 +166,7 @@ check: all alltools examples testprogs fate
 
 include $(SRC_PATH)/tests/Makefile
 
-$(sort $(OBJDIRS)):
+$(sort $(OUTDIRS)):
        $(Q)mkdir -p $@
 
 # Dummy rule to stop make trying to rebuild removed or renamed headers