vp3: Allocate a dummy reference frame if we have no keyframe

[ffmpeg] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index 9d818885c8ffa82182dbcb6210fb4ebd29996886..da61458df68a39b29d19fbb45bf3fcb05f39ee3e 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -5,11 +5,12 @@ include $(SUBDIR)../common.mak
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
 
+$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
+
 ifdef CONFIG_STATIC
 all: $(SUBDIR)$(LIBNAME)
 
 install-libs: install-lib$(NAME)-static
-install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
        $(RM) $@
@@ -17,6 +18,8 @@ $(SUBDIR)$(LIBNAME): $(OBJS)
        $(RANLIB) $@
 endif
 
+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
+
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
@@ -26,10 +29,10 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
        $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)%-test.o: $(SUBDIR)%.c
-       $$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+       $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
-       $$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
+       $$(CC) $$(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
 
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
        $$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
@@ -70,7 +73,7 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
        $(Q)cd "$(SHLIBDIR)" && \
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
-       $$(SLIB_INSTALL_EXTRA_CMD)
+       $(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib$(NAME)-static: MSG = $(LIBDIR)/$(LIBNAME)
 install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME)
@@ -78,7 +81,7 @@ install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME)
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
        $(Q)mkdir -p "$(LIBDIR)"
        $$(INSTALL) -m 644 $$< "$(LIBDIR)"
-       $$(LIB_INSTALL_EXTRA_CMD)
+       $(LIB_INSTALL_EXTRA_CMD)
 
 install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
        $(Q)mkdir -p "$(INCINSTDIR)"