summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 11:12:15 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-23 21:04:29 +0100
commit0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad (patch)
treeee2e8b0c841b1e614f4b608fbb6ef9fc38cfc807 /Makefile
parent9292fe4a1db90c3705d7e6275f3ddb9728b2d363 (diff)
Remove ffmpeg.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 19b8df42d3..d1b55ba3d1 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ COMPILE_S = $(call COMPILE,AS)
%.c %.h: TAG = GEN
-PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_AVCONV) += avconv
PROGS-$(CONFIG_AVPLAY) += avplay
PROGS-$(CONFIG_AVPROBE) += avprobe
@@ -65,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
-BASENAMES = ffmpeg avconv avplay avprobe avserver
+BASENAMES = avconv avplay avprobe avserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1)