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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · c83ef636a6
parent 31a68ad554
commit c83ef636a6
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -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)
--- a/3
+++ b/3
@ -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