Commit c83ef636 authored by Michael Niedermayer's avatar Michael Niedermayer

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

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 31a68ad5
...@@ -47,7 +47,7 @@ include $(SRC_PATH)/common.mak ...@@ -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)
......
...@@ -81,7 +81,7 @@ Configuration options: ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment