From 0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 11:12:15 +0100
Subject: Remove ffmpeg.

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Makefile')

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)
 
-- 
cgit v1.2.3