har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Disable avconv more completely while leaving the user the option to enable it

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-12 20:59:04 +01:00
parent 31a68ad554
commit c83ef636a6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -47,7 +47,7 @@ include $(SRC_PATH)/common.mak
FF_EXTRALIBS := $(FFEXTRALIBS) FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS) FF_DEP_LIBS := $(DEP_LIBS)
all: $(filter-out avconv, $(PROGS)) all: $(PROGS)
$(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF) $(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
$(CP) $< $@$(PROGSSUF) $(CP) $< $@$(PROGSSUF)

3
configure vendored
View File

@ -81,7 +81,7 @@ Configuration options:
and binaries will be unredistributable [no] and binaries will be unredistributable [no]
--disable-doc do not build documentation --disable-doc do not build documentation
--disable-ffmpeg disable ffmpeg build --disable-ffmpeg disable ffmpeg build
--disable-avconv disable avconv build --enable-avconv enable avconv build
--disable-ffplay disable ffplay build --disable-ffplay disable ffplay build
--disable-ffprobe disable ffprobe build --disable-ffprobe disable ffprobe build
--disable-ffserver disable ffserver build --disable-ffserver disable ffserver build
@ -1799,7 +1799,6 @@ enable debug
enable doc enable doc
enable fastdiv enable fastdiv
enable ffmpeg enable ffmpeg
enable avconv
enable ffplay enable ffplay
enable ffprobe enable ffprobe
enable ffserver enable ffserver