diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 20:59:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:05:14 +0100 |
| commit | c83ef636a665b2e17f1b6745a98ec7a5719264df (patch) | |
| tree | d6f1bcc7c841f6865f40367d63ffd59bca456a0a | |
| parent | 31a68ad554a1f6fc54ed1b845866fe480170774f (diff) | |
| download | ffmpeg-c83ef636a665b2e17f1b6745a98ec7a5719264df.tar.gz | |
build: Disable avconv more completely while leaving the user the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -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) @@ -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 |