libavformat: Use ffio_free_dyn_buf where applicable

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 71c068ca0e6c818b7d487b8a07cce754efbb1cd9..cc016b3cd11135470dd2c7f01dea53bd63a03de9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,11 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 AVPROGS-$(CONFIG_AVCONV)   += avconv
 AVPROGS-$(CONFIG_AVPLAY)   += avplay
 AVPROGS-$(CONFIG_AVPROBE)  += avprobe
-AVPROGS-$(CONFIG_AVSERVER) += avserver
 
 AVPROGS    := $(AVPROGS-yes:%=%$(EXESUF))
 PROGS      += $(AVPROGS)
 
-AVBASENAMES = avconv avplay avprobe avserver
+AVBASENAMES = avconv avplay avprobe
 ALLAVPROGS  = $(AVBASENAMES:%=%$(EXESUF))
 
 $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
@@ -105,7 +104,7 @@ FF_DEP_LIBS  := $(DEP_LIBS)
 all: $(AVPROGS)
 
 $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
-       $(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS)
+       $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
 
 tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
 
@@ -131,6 +130,7 @@ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 SUBDIR := $(1)/
 include $(SRC_PATH)/$(1)/Makefile
 -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
+-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
 include $(SRC_PATH)/library.mak
 endef
 
@@ -150,7 +150,7 @@ endef
 $(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
 
 $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
-       $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+       $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
 
 OBJDIRS += tools