@@ -27,7 +27,8 @@

 /ffplay

 /ffprobe

 /ffserver

-/config.*

+/config.asm

+/config.h

 /coverage.info

 /avversion.h

 /lcov/

@@ -1,5 +1,5 @@

 MAIN_MAKEFILE=1

-include config.mak

+include ffbuild/config.mak

 vpath %.c    $(SRC_PATH)

 vpath %.cpp  $(SRC_PATH)

@@ -66,7 +66,7 @@ SKIPHEADERS = cmdutils_common_opts.h                                    \

 all: all-yes

 include $(SRC_PATH)/tools/Makefile

-include $(SRC_PATH)/common.mak

+include $(SRC_PATH)/ffbuild/common.mak

 FF_EXTRALIBS := $(FFEXTRALIBS)

 FF_DEP_LIBS  := $(DEP_LIBS)

@@ -91,8 +91,8 @@ CONFIGURABLE_COMPONENTS =                                           \

     $(SRC_PATH)/libavcodec/bitstream_filters.c                      \

     $(SRC_PATH)/libavformat/protocols.c                             \

-config.h: .config

-.config: $(CONFIGURABLE_COMPONENTS)

+config.h: ffbuild/.config

+ffbuild/.config: $(CONFIGURABLE_COMPONENTS)

 	@-tput bold 2>/dev/null

 	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'

 	@-tput sgr0 2>/dev/null

@@ -115,7 +115,7 @@ SUBDIR := $(1)/

 include $(SRC_PATH)/$(1)/Makefile

 -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile

 -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile

-include $(SRC_PATH)/library.mak

+include $(SRC_PATH)/ffbuild/library.mak

 endef

 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))

@@ -142,10 +142,10 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)

 %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)

 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)

-VERSION_SH  = $(SRC_PATH)/version.sh

+VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh

 GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD

-.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak

+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak

 .version: M=@

 libavutil/ffversion.h .version:

@@ -194,7 +194,10 @@ clean::

 distclean::

 	$(RM) $(DISTCLEANSUFFIXES)

-	$(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c

+	$(RM) .version avversion.h config.asm config.h mapfile  \

+		ffbuild/.config ffbuild/config.* libavutil/avconfig.h \

+		version.h libavutil/ffversion.h libavcodec/codec_names.h \

+		libavcodec/bsf_list.c libavformat/protocol_list.c

 ifeq ($(SRC_LINK),src)

 	$(RM) src

 endif

deleted file mode 100644

@@ -1,17 +0,0 @@

-OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes)

-OBJS-$(HAVE_ARMV6)   += $(ARMV6-OBJS)   $(ARMV6-OBJS-yes)

-OBJS-$(HAVE_ARMV8)   += $(ARMV8-OBJS)   $(ARMV8-OBJS-yes)

-OBJS-$(HAVE_VFP)     += $(VFP-OBJS)     $(VFP-OBJS-yes)

-OBJS-$(HAVE_NEON)    += $(NEON-OBJS)    $(NEON-OBJS-yes)

-

-OBJS-$(HAVE_MIPSFPU)   += $(MIPSFPU-OBJS)    $(MIPSFPU-OBJS-yes)

-OBJS-$(HAVE_MIPSDSP)   += $(MIPSDSP-OBJS)    $(MIPSDSP-OBJS-yes)

-OBJS-$(HAVE_MIPSDSPR2) += $(MIPSDSPR2-OBJS)  $(MIPSDSPR2-OBJS-yes)

-OBJS-$(HAVE_MSA)       += $(MSA-OBJS)        $(MSA-OBJS-yes)

-OBJS-$(HAVE_MMI)   += $(MMI-OBJS)   $(MMI-OBJS-yes)

-

-OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)

-OBJS-$(HAVE_VSX)     += $(VSX-OBJS) $(VSX-OBJS-yes)

-

-OBJS-$(HAVE_MMX)     += $(MMX-OBJS)     $(MMX-OBJS-yes)

-OBJS-$(HAVE_YASM)    += $(YASM-OBJS)    $(YASM-OBJS-yes)

deleted file mode 100644

@@ -1,168 +0,0 @@

-#

-# common bits used by all libraries

-#

-

-DEFAULT_YASMD=.dbg

-

-ifeq ($(DBG),1)

-YASMD=$(DEFAULT_YASMD)

-else

-YASMD=

-endif

-

-ifndef SUBDIR

-

-ifndef V

-Q      = @

-ECHO   = printf "$(1)\t%s\n" $(2)

-BRIEF  = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES

-SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM

-

-MSG    = $@

-M      = @$(call ECHO,$(TAG),$@);

-$(foreach VAR,$(BRIEF), \

-    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))

-$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))

-$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))

-endif

-

-ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample

-

-# NASM requires -I path terminated with /

-IFLAGS     := -I. -I$(SRC_LINK)/

-CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)

-CFLAGS     += $(ECFLAGS)

-CCFLAGS     = $(CPPFLAGS) $(CFLAGS)

-OBJCFLAGS  += $(EOBJCFLAGS)

-OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)

-ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)

-CXXFLAGS   := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS)

-YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm

-

-HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)

-LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)

-

-define COMPILE

-       $(call $(1)DEP,$(1))

-       $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)

-endef

-

-COMPILE_C = $(call COMPILE,CC)

-COMPILE_CXX = $(call COMPILE,CXX)

-COMPILE_S = $(call COMPILE,AS)

-COMPILE_M = $(call COMPILE,OBJCC)

-COMPILE_HOSTC = $(call COMPILE,HOSTCC)

-

-%.o: %.c

-	$(COMPILE_C)

-

-%.o: %.cpp

-	$(COMPILE_CXX)

-

-%.o: %.m

-	$(COMPILE_M)

-

-%.s: %.c

-	$(CC) $(CCFLAGS) -S -o $@ $<

-

-%.o: %.S

-	$(COMPILE_S)

-

-%_host.o: %.c

-	$(COMPILE_HOSTC)

-

-%$(DEFAULT_YASMD).asm: %.asm

-	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d)

-	$(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@

-

-%.o: %.asm

-	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)

-	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)

-	-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)

-

-%.o: %.rc

-	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<

-

-%.i: %.c

-	$(CC) $(CCFLAGS) $(CC_E) $<

-

-%.h.c:

-	$(Q)echo '#include "$*.h"' >$@

-

-%.c %.h %.ver: TAG = GEN

-

-# Dummy rule to stop make trying to rebuild removed or renamed headers

-%.h:

-	@:

-

-# Disable suffix rules.  Most of the builtin rules are suffix rules,

-# so this saves some time on slow systems.

-.SUFFIXES:

-

-# Do not delete intermediate files from chains of implicit rules

-$(OBJS):

-endif

-

-include $(SRC_PATH)/arch.mak

-

-OBJS      += $(OBJS-yes)

-SLIBOBJS  += $(SLIBOBJS-yes)

-FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)

-TESTPROGS += $(TESTPROGS-yes)

-

-LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))

-FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)

-

-OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))

-SLIBOBJS  := $(sort $(SLIBOBJS:%=$(SUBDIR)%))

-TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)

-TESTPROGS := $(TESTPROGS:%=$(SUBDIR)tests/%$(EXESUF))

-HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)

-HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))

-TOOLS     += $(TOOLS-yes)

-TOOLOBJS  := $(TOOLS:%=tools/%.o)

-TOOLS     := $(TOOLS:%=tools/%$(EXESUF))

-HEADERS   += $(HEADERS-yes)

-

-PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(2)LIBNAME))

-DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib),$(CONFIG_SHARED:yes=S)))

-STATIC_DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))

-

-SRC_DIR    := $(SRC_PATH)/lib$(NAME)

-ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))

-SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)

-SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)

-HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))

-$(HOBJS):     CCFLAGS += $(CFLAGS_HEADERS)

-checkheaders: $(HOBJS)

-.SECONDARY:   $(HOBJS:.o=.c)

-

-alltools: $(TOOLS)

-

-$(HOSTOBJS): %.o: %.c

-	$(COMPILE_HOSTC)

-

-$(HOSTPROGS): %$(HOSTEXESUF): %.o

-	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS)

-

-$(OBJS):     | $(sort $(dir $(OBJS)))

-$(HOBJS):    | $(sort $(dir $(HOBJS)))

-$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))

-$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))

-$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))

-$(TOOLOBJS): | tools

-

-OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))

-

-CLEANSUFFIXES     = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.ho *$(DEFAULT_YASMD).asm

-DISTCLEANSUFFIXES = *.pc

-LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a

-

-define RULES

-clean::

-	$(RM) $(HOSTPROGS) $(TESTPROGS) $(TOOLS)

-endef

-

-$(eval $(RULES))

-

--include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_YASMD).d)

@@ -77,7 +77,7 @@ Help options:

   --list-filters           show all available filters

 Standard options:

-  --logfile=FILE           log tests and output to FILE [config.log]

+  --logfile=FILE           log tests and output to FILE [ffbuild/config.log]

   --disable-logging        do not log configure debug information

   --fatal-warnings         fail if any configure warning is generated

   --prefix=PREFIX          install in PREFIX [$prefix_default]

@@ -3224,7 +3224,7 @@ doc_deps_any="manpages htmlpages podpages txtpages"

 # default parameters

-logfile="config.log"

+logfile="ffbuild/config.log"

 # installation paths

 prefix_default="/usr/local"

@@ -3581,6 +3581,7 @@ disable_components(){

 map 'disable_components $v' $LIBRARY_LIST

+mkdir -p ffbuild

 echo "# $0 $FFMPEG_CONFIGURATION" > $logfile

 set >> $logfile

@@ -5152,7 +5153,7 @@ esc(){

     echo "$*" | sed 's/%/%25/g;s/:/%3a/g'

 }

-echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" >config.fate

+echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate

 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic

@@ -6619,9 +6620,9 @@ test -e Makefile || echo "include $source_path/Makefile" > Makefile

 enabled stripping || strip="echo skipping strip"

-config_files="$TMPH config.mak doc/config.texi"

+config_files="$TMPH ffbuild/config.mak doc/config.texi"

-cat > config.mak <<EOF

+cat > ffbuild/config.mak <<EOF

 # Automatically generated by configure - do not modify!

 ifndef FFMPEG_CONFIG_MAK

 FFMPEG_CONFIG_MAK=1

@@ -6755,18 +6756,18 @@ get_version(){

     eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")

     enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))

     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO

-    eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak

-    eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak

-    eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak

+    eval echo "${lcname}_VERSION=\$${name}_VERSION"             >> ffbuild/config.mak

+    eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> ffbuild/config.mak

+    eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> ffbuild/config.mak

 }

 map 'get_version $v' $LIBRARY_LIST

-map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST

+map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST

 print_program_extralibs(){

     eval "program_extralibs=\$${1}_extralibs"

-    eval echo "EXTRALIBS-${1}=${program_extralibs}" >> config.mak

+    eval echo "EXTRALIBS-${1}=${program_extralibs}" >> ffbuild/config.mak

 }

 map 'print_program_extralibs $v' $PROGRAM_LIST

@@ -6816,11 +6817,11 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \

                                      $ALL_COMPONENTS    \

 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH

-echo "endif # FFMPEG_CONFIG_MAK" >> config.mak

+echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak

 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.

 cp_if_changed $TMPH config.h

-touch .config

+touch ffbuild/.config

 enabled yasm && cp_if_changed $TMPASM config.asm

@@ -128,7 +128,7 @@ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples

 OBJDIRS += doc/examples

 DOXY_INPUT      = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)

-DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) config.mak

+DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak

 doc/doxy/html: TAG = DOXY

 doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)

@@ -38,14 +38,14 @@ the build system and the C:

     --- after running configure ---

-    $ grep FOOBAR config.mak

+    $ grep FOOBAR ffbuild/config.mak

     CONFIG_FOOBAR_FILTER=yes

     $ grep FOOBAR config.h

     #define CONFIG_FOOBAR_FILTER 1

-CONFIG_FOOBAR_FILTER=yes from the config.mak is later used to enable the filter in

-libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h will be used

-for registering the filter in libavfilter/allfilters.c.

+CONFIG_FOOBAR_FILTER=yes from the ffbuild/config.mak is later used to enable

+the filter in libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h

+will be used for registering the filter in libavfilter/allfilters.c.

 Filter code layout

 ==================

new file mode 100644

@@ -0,0 +1,4 @@

+/.config

+/config.fate

+/config.log

+/config.mak

new file mode 100644

@@ -0,0 +1,17 @@

+OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes)

+OBJS-$(HAVE_ARMV6)   += $(ARMV6-OBJS)   $(ARMV6-OBJS-yes)

+OBJS-$(HAVE_ARMV8)   += $(ARMV8-OBJS)   $(ARMV8-OBJS-yes)

+OBJS-$(HAVE_VFP)     += $(VFP-OBJS)     $(VFP-OBJS-yes)

+OBJS-$(HAVE_NEON)    += $(NEON-OBJS)    $(NEON-OBJS-yes)

+

+OBJS-$(HAVE_MIPSFPU)   += $(MIPSFPU-OBJS)    $(MIPSFPU-OBJS-yes)

+OBJS-$(HAVE_MIPSDSP)   += $(MIPSDSP-OBJS)    $(MIPSDSP-OBJS-yes)

+OBJS-$(HAVE_MIPSDSPR2) += $(MIPSDSPR2-OBJS)  $(MIPSDSPR2-OBJS-yes)

+OBJS-$(HAVE_MSA)       += $(MSA-OBJS)        $(MSA-OBJS-yes)

+OBJS-$(HAVE_MMI)   += $(MMI-OBJS)   $(MMI-OBJS-yes)

+

+OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)

+OBJS-$(HAVE_VSX)     += $(VSX-OBJS) $(VSX-OBJS-yes)

+

+OBJS-$(HAVE_MMX)     += $(MMX-OBJS)     $(MMX-OBJS-yes)

+OBJS-$(HAVE_YASM)    += $(YASM-OBJS)    $(YASM-OBJS-yes)

new file mode 100644

@@ -0,0 +1,168 @@

+#

+# common bits used by all libraries

+#

+

+DEFAULT_YASMD=.dbg

+

+ifeq ($(DBG),1)

+YASMD=$(DEFAULT_YASMD)

+else

+YASMD=

+endif

+

+ifndef SUBDIR

+

+ifndef V

+Q      = @

+ECHO   = printf "$(1)\t%s\n" $(2)

+BRIEF  = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES

+SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM

+

+MSG    = $@

+M      = @$(call ECHO,$(TAG),$@);

+$(foreach VAR,$(BRIEF), \

+    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))

+$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))

+$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))

+endif

+

+ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample

+

+# NASM requires -I path terminated with /

+IFLAGS     := -I. -I$(SRC_LINK)/

+CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)

+CFLAGS     += $(ECFLAGS)

+CCFLAGS     = $(CPPFLAGS) $(CFLAGS)

+OBJCFLAGS  += $(EOBJCFLAGS)

+OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)

+ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)

+CXXFLAGS   := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS)

+YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm

+

+HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)

+LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)

+

+define COMPILE

+       $(call $(1)DEP,$(1))

+       $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)

+endef

+

+COMPILE_C = $(call COMPILE,CC)

+COMPILE_CXX = $(call COMPILE,CXX)

+COMPILE_S = $(call COMPILE,AS)

+COMPILE_M = $(call COMPILE,OBJCC)

+COMPILE_HOSTC = $(call COMPILE,HOSTCC)

+

+%.o: %.c

+	$(COMPILE_C)

+

+%.o: %.cpp

+	$(COMPILE_CXX)

+

+%.o: %.m

+	$(COMPILE_M)

+

+%.s: %.c

+	$(CC) $(CCFLAGS) -S -o $@ $<

+

+%.o: %.S

+	$(COMPILE_S)

+

+%_host.o: %.c

+	$(COMPILE_HOSTC)

+

+%$(DEFAULT_YASMD).asm: %.asm

+	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d)

+	$(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@

+

+%.o: %.asm

+	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)

+	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)

+	-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)

+

+%.o: %.rc

+	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<

+

+%.i: %.c

+	$(CC) $(CCFLAGS) $(CC_E) $<

+

+%.h.c:

+	$(Q)echo '#include "$*.h"' >$@

+

+%.c %.h %.ver: TAG = GEN

+

+# Dummy rule to stop make trying to rebuild removed or renamed headers

+%.h:

+	@:

+

+# Disable suffix rules.  Most of the builtin rules are suffix rules,

+# so this saves some time on slow systems.

+.SUFFIXES:

+

+# Do not delete intermediate files from chains of implicit rules

+$(OBJS):

+endif

+

+include $(SRC_PATH)/ffbuild/arch.mak

+

+OBJS      += $(OBJS-yes)

+SLIBOBJS  += $(SLIBOBJS-yes)

+FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)

+TESTPROGS += $(TESTPROGS-yes)

+

+LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))

+FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)

+

+OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))

+SLIBOBJS  := $(sort $(SLIBOBJS:%=$(SUBDIR)%))

+TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)

+TESTPROGS := $(TESTPROGS:%=$(SUBDIR)tests/%$(EXESUF))

+HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)

+HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))

+TOOLS     += $(TOOLS-yes)

+TOOLOBJS  := $(TOOLS:%=tools/%.o)

+TOOLS     := $(TOOLS:%=tools/%$(EXESUF))

+HEADERS   += $(HEADERS-yes)

+

+PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(2)LIBNAME))

+DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib),$(CONFIG_SHARED:yes=S)))

+STATIC_DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))

+

+SRC_DIR    := $(SRC_PATH)/lib$(NAME)

+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))

+SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)

+SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)

+HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))

+$(HOBJS):     CCFLAGS += $(CFLAGS_HEADERS)

+checkheaders: $(HOBJS)

+.SECONDARY:   $(HOBJS:.o=.c)

+

+alltools: $(TOOLS)

+

+$(HOSTOBJS): %.o: %.c

+	$(COMPILE_HOSTC)

+

+$(HOSTPROGS): %$(HOSTEXESUF): %.o

+	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS)

+

+$(OBJS):     | $(sort $(dir $(OBJS)))

+$(HOBJS):    | $(sort $(dir $(HOBJS)))

+$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))

+$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))

+$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))

+$(TOOLOBJS): | tools

+

+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))

+

+CLEANSUFFIXES     = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.ho *$(DEFAULT_YASMD).asm

+DISTCLEANSUFFIXES = *.pc

+LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a

+

+define RULES

+clean::

+	$(RM) $(HOSTPROGS) $(TESTPROGS) $(TOOLS)

+endef

+

+$(eval $(RULES))

+

+-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_YASMD).d)

new file mode 100644

@@ -0,0 +1,98 @@

+include $(SRC_PATH)/ffbuild/common.mak

+

+LIBVERSION := $(lib$(NAME)_VERSION)

+LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)

+LIBMINOR   := $(lib$(NAME)_VERSION_MINOR)

+INCINSTDIR := $(INCDIR)/lib$(NAME)

+

+INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)

+

+all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)

+all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)

+

+LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)

+$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H

+$(TESTOBJS) $(TESTOBJS:.o=.i): CFLAGS += -Umain

+

+$(SUBDIR)$(LIBNAME): $(OBJS)

+	$(RM) $@

+	$(AR) $(ARFLAGS) $(AR_O) $^

+	$(RANLIB) $@

+

+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig

+

+install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static

+install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared

+

+define RULES

+$(TOOLS):     THISLIB = $(FULLNAME:%=$(LD_LIB))

+$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)

+

+$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o

+	$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)

+

+$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)

+	$$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@

+

+$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)

+	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)

+

+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver

+	$(SLIB_CREATE_DEF_CMD)

+	$$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)

+	$(SLIB_EXTRA_CMD)

+

+ifdef SUBDIR

+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)

+endif

+

+clean::

+	$(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \

+	    $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%)

+ 

+distclean:: clean

+	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \

+            $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%)

+

+install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)

+	$(Q)mkdir -p "$(SHLIBDIR)"

+	$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"

+	$$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"

+	$(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));)

+	$(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")

+	$(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")

+	$(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")

+

+install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)

+	$(Q)mkdir -p "$(LIBDIR)"

+	$$(INSTALL) -m 644 $$< "$(LIBDIR)"

+	$(LIB_INSTALL_EXTRA_CMD)

+

+install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))

+	$(Q)mkdir -p "$(INCINSTDIR)"

+	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"

+

+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc

+	$(Q)mkdir -p "$(PKGCONFIGDIR)"

+	$$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"

+

+uninstall-libs::

+	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \

+	       "$(SHLIBDIR)/$(SLIBNAME)"            \

+	       "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"

+	-$(RM)  $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%")

+	-$(RM)  $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%")

+	-$(RM) "$(LIBDIR)/$(LIBNAME)"

+

+uninstall-headers::

+	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))

+	$(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"

+	-rmdir "$(INCINSTDIR)"

+endef

+

+$(eval $(RULES))

+

+$(TOOLS):     $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)

+$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)

+

+testprogs: $(TESTPROGS)

new file mode 100755

@@ -0,0 +1,63 @@

+#!/bin/sh

+

+# Usage: version.sh <ffmpeg-root-dir> <output-version.h> <extra-version>

+

+# check for git short hash

+if ! test "$revision"; then

+    if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then

+        revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)

+    else

+        revision=$(cd "$1" && git describe --tags --always 2> /dev/null)

+    fi

+fi

+

+# Shallow Git clones (--depth) do not have the N tag:

+# use 'git-YYYY-MM-DD-hhhhhhh'.

+test "$revision" || revision=$(cd "$1" &&

+  git log -1 --pretty=format:"git-%cd-%h" --date=short 2> /dev/null)

+

+# Snapshots from gitweb are in a directory called ffmpeg-hhhhhhh or

+# ffmpeg-HEAD-hhhhhhh.

+if [ -z "$revision" ]; then

+  srcdir=$(cd "$1" && pwd)

+  case "$srcdir" in

+    */ffmpeg-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])

+      git_hash="${srcdir##*-}";;

+    */ffmpeg-HEAD-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])

+      git_hash="${srcdir##*-}";;

+  esac

+fi

+

+# no revision number found

+test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)

+

+# Append the Git hash if we have one

+test "$revision" && test "$git_hash" && revision="$revision-$git_hash"

+

+# releases extract the version number from the VERSION file

+version=$(cd "$1" && cat VERSION 2> /dev/null)

+test "$version" || version=$revision

+

+test -n "$3" && version=$version-$3

+

+if [ -z "$2" ]; then

+    echo "$version"

+    exit

+fi

+

+NEW_REVISION="#define FFMPEG_VERSION \"$version\""

+OLD_REVISION=$(cat "$2" 2> /dev/null | head -4 | tail -1)

+

+# String used for preprocessor guard

+GUARD=$(echo "$2" | sed 's/\//_/' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//')

+

+# Update version header only on revision changes to avoid spurious rebuilds

+if test "$NEW_REVISION" != "$OLD_REVISION"; then

+    cat << EOF > "$2"

+/* Automatically generated by version.sh, do not manually edit! */

+#ifndef $GUARD

+#define $GUARD

+$NEW_REVISION

+#endif /* $GUARD */

+EOF

+fi

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME = avcodec

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME    = avdevice

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME = avfilter

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME = avformat

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME = avutil

@@ -1,4 +1,4 @@

-include $(SUBDIR)../config.mak

+include $(SUBDIR)../ffbuild/config.mak

 NAME = postproc

 FFLIBS = avutil

deleted file mode 100644

@@ -1,98 +0,0 @@

-include $(SRC_PATH)/common.mak

-

-LIBVERSION := $(lib$(NAME)_VERSION)

-LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)

-LIBMINOR   := $(lib$(NAME)_VERSION_MINOR)

-INCINSTDIR := $(INCDIR)/lib$(NAME)

-

-INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)

-

-all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)

-all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)

-

-LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)

-$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H

-$(TESTOBJS) $(TESTOBJS:.o=.i): CFLAGS += -Umain

-

-$(SUBDIR)$(LIBNAME): $(OBJS)

-	$(RM) $@

-	$(AR) $(ARFLAGS) $(AR_O) $^

-	$(RANLIB) $@

-

-install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig

-

-install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static

-install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared

-

-define RULES

-$(TOOLS):     THISLIB = $(FULLNAME:%=$(LD_LIB))

-$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)

-

-$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o

-	$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)

-

-$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)

-	$$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@

-

-$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)

-	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)

-

-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver

-	$(SLIB_CREATE_DEF_CMD)

-	$$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)

-	$(SLIB_EXTRA_CMD)

-

-ifdef SUBDIR

-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)

-endif

-

-clean::

-	$(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \

-	    $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%)

- 

-distclean:: clean

-	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \

-            $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%)

-

-install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)

-	$(Q)mkdir -p "$(SHLIBDIR)"

-	$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"

-	$$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"

-	$(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));)

-	$(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")

-	$(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")

-	$(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")

-

-install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)

-	$(Q)mkdir -p "$(LIBDIR)"

-	$$(INSTALL) -m 644 $$< "$(LIBDIR)"

-	$(LIB_INSTALL_EXTRA_CMD)

-

-install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))

-	$(Q)mkdir -p "$(INCINSTDIR)"

-	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"

-

-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc

-	$(Q)mkdir -p "$(PKGCONFIGDIR)"

-	$$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"

-

-uninstall-libs::

-	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \

-	       "$(SHLIBDIR)/$(SLIBNAME)"            \

-	       "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"

-	-$(RM)  $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%")

-	-$(RM)  $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%")

-	-$(RM) "$(LIBDIR)/$(LIBNAME)"

-

-uninstall-headers::