Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.10
Michael Niedermayer 13 years ago
parent
commit
c83ef636a6
2 changed files with 2 additions and 3 deletions
  1. +1
    -1
      Makefile
  2. +1
    -2
      configure

+ 1
- 1
Makefile View File

@@ -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)


+ 1
- 2
configure View File

@@ -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…
Cancel
Save