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

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 5e1dae66aab445cb597270819686a213c6a6769d..783971fdbf3a4530fdcbbf86bd4e2dd3a70f8452 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ CFLAGS     += $(ECFLAGS)
 CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
 YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
-HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
+HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 
 define COMPILE
@@ -45,6 +45,9 @@ COMPILE_S = $(call COMPILE,AS)
 %.o: %.S
        $(COMPILE_S)
 
+%.i: %.c
+       $(CC) $(CCFLAGS) $(CC_E) $<
+
 %.h.c:
        $(Q)echo '#include "$*.h"' >$@
 
@@ -81,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
 
@@ -103,7 +106,7 @@ config.h: .config
 
 SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
                HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
-               ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS             \
+               ARMV5TE-OBJS ARMV6-OBJS VFP-OBJS NEON-OBJS                \
                ALTIVEC-OBJS VIS-OBJS                                     \
                MMX-OBJS YASM-OBJS                                        \
                OBJS HOSTOBJS TESTOBJS
@@ -184,12 +187,12 @@ uninstall-data:
 clean::
        $(RM) $(ALLPROGS)
        $(RM) $(CLEANSUFFIXES)
-       $(RM) $(TOOLS)
        $(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)