aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-09-24 23:21:02 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-09-24 23:21:02 +0000
commit2744a37fac86eee2b2af652493d6cf8aa5f4c375 (patch)
tree40a4ac67dcb765e0a80b1f0f2e257baf7ebba077
parent5ed8fafcb6299dcf788438356a0a311344001db3 (diff)
downloadffmpeg-2744a37fac86eee2b2af652493d6cf8aa5f4c375.tar.gz
added new ffplay program
Originally committed as revision 143 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e93365bf7d..0a4f7c08a3 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ EXE=.exe
PROG=ffmpeg$(EXE)
else
EXT=
-PROG=ffmpeg ffserver
+PROG=ffmpeg ffplay ffserver
endif
all: lib $(PROG)
@@ -30,11 +30,15 @@ ffmpeg$(EXE): ffmpeg.o libav/libav.a libavcodec/libavcodec.a
ffserver$(EXE): ffserver.o libav/libav.a libavcodec/libavcodec.a
$(CC) $(LDFLAGS) -o $@ $^ -lm
+ffplay: ffmpeg$(EXE)
+ ln -sf $< $@
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
install: all
install -s -m 755 $(PROG) $(prefix)/bin
+ ln -sf ffmpeg $(prefix)/bin/ffplay
clean:
$(MAKE) -C libavcodec clean