summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-21 11:43:01 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-21 11:43:01 +0000
commit336ce917e6e6adb10ee44945684c67cdea65e228 (patch)
treeb28d596126f0a4eb6263e098c194881f3edbdfb7 /Makefile
parentf05ef45c8f936907d0cad71d80c423ebe75d4738 (diff)
Add FFprobe tool.
This is a simplified / cleaned-up version of the SourceForge program: http://sourceforge.net/projects/ffprobe/ Syntax / features may be different, in particular the options -show_packets and -show_frames are not yet supported in this version. Originally committed as revision 21936 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 49033816ab..0dc6d4d426 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ vpath %.texi $(SRC_PATH_BARE)
PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_FFPLAY) += ffplay
+PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER) += ffserver
PROGS := $(addsuffix $(EXESUF), $(PROGS-yes))
@@ -15,7 +16,7 @@ MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr)
-BASENAMES = ffmpeg ffplay ffserver
+BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES))
ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES))
ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
@@ -87,7 +88,7 @@ cmdutils.o cmdutils.d: version.h
alltools: $(TOOLS)
documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \
- ffplay-doc.html ffserver-doc.html \
+ ffplay-doc.html ffprobe-doc.html ffserver-doc.html \
general.html libavfilter.html $(ALLMANPAGES))
doc/%.html: doc/%.texi