diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 21:55:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-25 22:46:37 +0100 |
| commit | def678956a19767e4ef714c8f4d43dd96f4ce967 (patch) | |
| tree | 9573f6158eafceded136c1ff718004126bf7cd10 /Makefile | |
| parent | 1285baaab550e3e761590ef6dfb1d9bd9d1332e4 (diff) | |
| download | ffmpeg-def678956a19767e4ef714c8f4d43dd96f4ce967.tar.gz | |
Remove avconv
All features have been merged into ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -11,7 +11,6 @@ vpath %.texi $(SRC_PATH) vpath %/fate_config.sh.template $(SRC_PATH) PROGS-$(CONFIG_FFMPEG) += ffmpeg -PROGS-$(CONFIG_AVCONV) += avconv PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFSERVER) += ffserver @@ -24,7 +23,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg avconv ffplay ffprobe ffserver +BASENAMES = ffmpeg ffplay ffprobe ffserver ALLPROGS = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF)) ALLPROGS_G = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) |