aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-07-26 17:51:34 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-09 19:56:21 +0200
commit266463daff7bbd4c3a8a26ff11b1131df0fd5520 (patch)
treeb7f190b7a5fe4fae5e392372f599624c5450cfee /Makefile
parent7351eb14151602fa924ab3d5e374b7d60f32aff9 (diff)
downloadffmpeg-266463daff7bbd4c3a8a26ff11b1131df0fd5520.tar.gz
Rename ffplay to avplay.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9d6ec3a46d..5214f5a45e 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ COMPILE_S = $(call COMPILE,AS)
%.c %.h: TAG = GEN
PROGS-$(CONFIG_FFMPEG) += ffmpeg
-PROGS-$(CONFIG_FFPLAY) += ffplay
+PROGS-$(CONFIG_AVPLAY) += avplay
PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER) += ffserver
@@ -64,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
-BASENAMES = ffmpeg ffplay ffprobe ffserver
+BASENAMES = ffmpeg avplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1)
@@ -116,8 +116,8 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
-ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
+avplay.o: CFLAGS += $(SDL_CFLAGS)
+avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)