From 5a0f713118b9290c37cc19009cc7019d94ab70a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 26 Jan 2010 23:13:01 +0000 Subject: [PATCH] Allow disabling of lavc, lavf, lavd, and lsws Originally committed as revision 21468 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 6 +++++- configure | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bc8410e6be..280af61d0b 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,14 @@ ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) +FFLIBS-$(CONFIG_AVCODEC) += avcodec +FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter +FFLIBS-$(CONFIG_AVFORMAT) += avformat FFLIBS-$(CONFIG_POSTPROC) += postproc +FFLIBS-$(CONFIG_SWSCALE) += swscale -FFLIBS := avdevice avformat avcodec avutil swscale +FFLIBS := avutil DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) diff --git a/configure b/configure index 23f43ff189..de16b2b7d5 100755 --- a/configure +++ b/configure @@ -83,6 +83,10 @@ Configuration options: --disable-ffmpeg disable ffmpeg build --disable-ffplay disable ffplay build --disable-ffserver disable ffserver build + --disable-avdevice disable libavdevice build + --disable-avcodec disable libavcodec build + --disable-avformat disable libavformat build + --disable-swscale disable libswscale build --enable-postproc enable GPLed postprocessing support [no] --enable-avfilter video filter support [no] --enable-avfilter-lavf video filters dependent on avformat [no] @@ -858,8 +862,11 @@ COMPONENT_LIST=" CONFIG_LIST=" $COMPONENT_LIST aandct + avcodec + avdevice avfilter avfilter_lavf + avformat avisynth beos_netserver bzlib @@ -908,6 +915,7 @@ CONFIG_LIST=" shared small static + swscale swscale_alpha vaapi vdpau @@ -1348,10 +1356,16 @@ udp_protocol_deps="network" # filters movie_filter_deps="avfilter_lavf" +avfilter_lavf_deps="avformat" + +# libraries +avdevice_deps="avcodec avformat" +avformat_deps="avcodec" # programs -ffplay_deps="sdl" -ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer" +ffmpeg_deps="avcodec avformat swscale" +ffplay_deps="avcodec avformat swscale sdl" +ffserver_deps="avformat ffm_muxer rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' doc_deps="texi2html" @@ -1392,6 +1406,9 @@ target_os=$(tolower $(uname -s)) host_os=$target_os # configurable options +enable avcodec +enable avdevice +enable avformat enable asm enable debug enable doc @@ -1405,6 +1422,7 @@ enable optimizations enable protocols enable static enable stripping +enable swscale enable swscale_alpha # build settings