From c83ef636a665b2e17f1b6745a98ec7a5719264df Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 12 Dec 2011 20:59:04 +0100
Subject: [PATCH] build: Disable avconv more completely while leaving the user
the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
Makefile | 2 +-
configure | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 24fc455f468..c0af5c2c74e 100644
--- a/Makefile
+++ b/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)
diff --git a/configure b/configure
index cc7ba534df9..50b5c3a3698 100755
--- a/configure
+++ b/configure
@@ -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
--
GitLab