0cb233cf46
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
163 lines
3.9 KiB
Makefile
163 lines
3.9 KiB
Makefile
MAIN_MAKEFILE=1
|
|
include config.mak
|
|
|
|
vpath %.c $(SRC_PATH)
|
|
vpath %.h $(SRC_PATH)
|
|
vpath %.S $(SRC_PATH)
|
|
vpath %.asm $(SRC_PATH)
|
|
vpath %.v $(SRC_PATH)
|
|
vpath %.texi $(SRC_PATH)
|
|
|
|
|
|
PROGS-$(CONFIG_FFMPEG) += ffmpeg
|
|
PROGS-$(CONFIG_AVCONV) += avconv
|
|
PROGS-$(CONFIG_FFPLAY) += ffplay
|
|
PROGS-$(CONFIG_FFPROBE) += ffprobe
|
|
PROGS-$(CONFIG_FFSERVER) += ffserver
|
|
|
|
PROGS := $(PROGS-yes:%=%$(EXESUF))
|
|
PROGS_G = $(PROGS-yes:%=%_g$(EXESUF))
|
|
OBJS = $(PROGS-yes:%=%.o) cmdutils.o
|
|
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
|
|
HOSTPROGS := $(TESTTOOLS:%=tests/%)
|
|
TOOLS = qt-faststart trasher
|
|
TOOLS-$(CONFIG_ZLIB) += cws2fws
|
|
|
|
BASENAMES = ffmpeg avconv ffplay ffprobe ffserver
|
|
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
|
|
ALLPROGS_G = $(BASENAMES:%=%_g$(EXESUF))
|
|
ALLMANPAGES = $(BASENAMES:%=%.1)
|
|
|
|
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
|
|
FFLIBS-$(CONFIG_AVFILTER) += avfilter
|
|
FFLIBS-$(CONFIG_AVFORMAT) += avformat
|
|
FFLIBS-$(CONFIG_AVCODEC) += avcodec
|
|
FFLIBS-$(CONFIG_POSTPROC) += postproc
|
|
FFLIBS-$(CONFIG_SWSCALE) += swscale
|
|
|
|
FFLIBS := avutil
|
|
|
|
DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
|
|
|
|
SKIPHEADERS = cmdutils_common_opts.h
|
|
|
|
include $(SRC_PATH)/common.mak
|
|
|
|
FF_EXTRALIBS := $(FFEXTRALIBS)
|
|
FF_DEP_LIBS := $(DEP_LIBS)
|
|
|
|
all: $(PROGS)
|
|
|
|
$(PROGS): %$(EXESUF): %_g$(EXESUF)
|
|
$(CP) $< $@
|
|
$(STRIP) $@
|
|
|
|
$(TOOLS): %$(EXESUF): %.o
|
|
$(LD) $(LDFLAGS) -o $@ $< $(ELIBS)
|
|
|
|
tools/cws2fws$(EXESUF): ELIBS = -lz
|
|
|
|
config.h: .config
|
|
.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
|
|
@-tput bold 2>/dev/null
|
|
@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
|
|
@-tput sgr0 2>/dev/null
|
|
|
|
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
|
|
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
|
|
HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS
|
|
|
|
define RESET
|
|
$(1) :=
|
|
$(1)-yes :=
|
|
endef
|
|
|
|
define DOSUBDIR
|
|
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
|
|
SUBDIR := $(1)/
|
|
include $(SRC_PATH)/$(1)/Makefile
|
|
endef
|
|
|
|
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
|
|
|
|
ffplay.o: CFLAGS += $(SDL_CFLAGS)
|
|
ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
|
|
ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
|
|
|
|
%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
|
|
$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
|
|
|
|
OBJDIRS += tools
|
|
|
|
-include $(wildcard tools/*.d)
|
|
|
|
VERSION_SH = $(SRC_PATH)/version.sh
|
|
GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
|
|
|
|
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
|
|
.version: M=@
|
|
|
|
version.h .version:
|
|
$(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
|
|
$(Q)touch .version
|
|
|
|
# force version.sh to run whenever version might have changed
|
|
-include .version
|
|
|
|
ifdef PROGS
|
|
install: install-progs install-data
|
|
endif
|
|
|
|
install: install-libs install-headers
|
|
|
|
install-libs: install-libs-yes
|
|
|
|
install-progs-yes:
|
|
install-progs-$(CONFIG_SHARED): install-libs
|
|
|
|
install-progs: install-progs-yes $(PROGS)
|
|
$(Q)mkdir -p "$(BINDIR)"
|
|
$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
|
|
|
|
install-data: $(DATA_FILES)
|
|
$(Q)mkdir -p "$(DATADIR)"
|
|
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
|
|
|
|
uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
|
|
|
|
uninstall-progs:
|
|
$(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))
|
|
|
|
uninstall-data:
|
|
$(RM) -r "$(DATADIR)"
|
|
|
|
clean::
|
|
$(RM) $(ALLPROGS) $(ALLPROGS_G)
|
|
$(RM) $(CLEANSUFFIXES)
|
|
$(RM) $(TOOLS)
|
|
$(RM) $(CLEANSUFFIXES:%=tools/%)
|
|
|
|
distclean::
|
|
$(RM) $(DISTCLEANSUFFIXES)
|
|
$(RM) config.* .version version.h libavutil/avconfig.h
|
|
|
|
config:
|
|
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
|
|
|
|
include $(SRC_PATH)/doc/Makefile
|
|
include $(SRC_PATH)/tests/Makefile
|
|
|
|
$(sort $(OBJDIRS)):
|
|
$(Q)mkdir -p $@
|
|
|
|
# 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:
|
|
|
|
.PHONY: all all-yes alltools *clean config examples install*
|
|
.PHONY: testprogs uninstall*
|