hls: Don't check discard flags until the parent demuxer's streams actually exist

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 290cf640c9aaf0065bd9908c1a6324fc5feffe54..783971fdbf3a4530fdcbbf86bd4e2dd3a70f8452 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ FFLIBS := avutil
 
 DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
 
-SKIPHEADERS = cmdutils_common_opts.h
+SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
 
 include $(SRC_PATH)/common.mak
 
@@ -188,10 +188,11 @@ clean::
        $(RM) $(ALLPROGS)
        $(RM) $(CLEANSUFFIXES)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
+       $(RM) -rf coverage.info lcov
 
 distclean::
        $(RM) $(DISTCLEANSUFFIXES)
-       $(RM) config.* .version version.h libavutil/avconfig.h
+       $(RM) config.* .config libavutil/avconfig.h .version version.h
 
 config:
        $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)