Fix a crash when decoding tiff by moving check

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index e9d98545a76960d51c17791f388d4b83e02c76c6..673110311d1eb3079905680f2b5f25fb18f4096b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@ PROGS      := $(addsuffix   $(EXESUF), $(PROGS-yes))
 PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
 OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
-HTMLPAGES   = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes)))
+PODPAGES    = $(addprefix doc/, $(addsuffix .pod, $(PROGS-yes)))
+HTMLPAGES   = $(addprefix doc/, $(addsuffix .html, $(PROGS-yes)))
 TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
 HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64)
 
@@ -21,7 +22,7 @@ BASENAMES   = ffmpeg ffplay ffprobe ffserver
 ALLPROGS    = $(addsuffix   $(EXESUF), $(BASENAMES))
 ALLPROGS_G  = $(addsuffix _g$(EXESUF), $(BASENAMES))
 ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
-ALLHTMLPAGES= $(addsuffix -doc.html, $(BASENAMES))
+ALLHTMLPAGES= $(addsuffix .html, $(BASENAMES))
 
 FFLIBS-$(CONFIG_AVDEVICE) += avdevice
 FFLIBS-$(CONFIG_AVFILTER) += avfilter
@@ -90,7 +91,7 @@ tools/%$(EXESUF): tools/%.o
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 tools/%.o: tools/%.c
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)
 
@@ -113,18 +114,19 @@ alltools: $(TOOLS)
 documentation: $(addprefix doc/, developer.html faq.html general.html libavfilter.html \
                                  $(ALLHTMLPAGES) $(ALLMANPAGES))
 
-$(HTMLPAGES) $(MANPAGES): doc/fftools-common-opts.texi
+$(HTMLPAGES) $(PODPAGES): doc/fftools-common-opts.texi
 
-doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
-doc/ffplay.pod doc/ffplay-doc.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
-doc/ffprobe.pod doc/ffprobe-doc.html: doc/indevs.texi doc/protocols.texi
+doc/ffmpeg.pod doc/ffmpeg.html: doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi doc/metadata.texi
+doc/ffplay.pod doc/ffplay.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
+doc/ffprobe.pod doc/ffprobe.html: doc/indevs.texi doc/protocols.texi
+doc/libavfilter.html: doc/filters.texi
 
 doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi
        $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%)
 
 doc/%.pod: TAG = POD
-doc/%.pod: doc/%-doc.texi
+doc/%.pod: doc/%.texi
        $(M)doc/texi2pod.pl $< $@
 
 doc/%.1: TAG = MAN