mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
build: Disable avconv more completely while leaving the user the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
31a68ad554
commit
c83ef636a6
2
Makefile
2
Makefile
@ -47,7 +47,7 @@ include $(SRC_PATH)/common.mak
|
||||
FF_EXTRALIBS := $(FFEXTRALIBS)
|
||||
FF_DEP_LIBS := $(DEP_LIBS)
|
||||
|
||||
all: $(filter-out avconv, $(PROGS))
|
||||
all: $(PROGS)
|
||||
|
||||
$(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
|
||||
$(CP) $< $@$(PROGSSUF)
|
||||
|
3
configure
vendored
3
configure
vendored
@ -81,7 +81,7 @@ Configuration options:
|
||||
and binaries will be unredistributable [no]
|
||||
--disable-doc do not build documentation
|
||||
--disable-ffmpeg disable ffmpeg build
|
||||
--disable-avconv disable avconv build
|
||||
--enable-avconv enable avconv build
|
||||
--disable-ffplay disable ffplay build
|
||||
--disable-ffprobe disable ffprobe build
|
||||
--disable-ffserver disable ffserver build
|
||||
@ -1799,7 +1799,6 @@ enable debug
|
||||
enable doc
|
||||
enable fastdiv
|
||||
enable ffmpeg
|
||||
enable avconv
|
||||
enable ffplay
|
||||
enable ffprobe
|
||||
enable ffserver
|
||||
|
Loading…
Reference in New Issue
Block a user