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

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 51947fa34a68fae8aeb99c750390f2ca3738f3bb..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,6 +188,7 @@ clean::
        $(RM) $(ALLPROGS)
        $(RM) $(CLEANSUFFIXES)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
+       $(RM) -rf coverage.info lcov
 
 distclean::
        $(RM) $(DISTCLEANSUFFIXES)