Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8a47b2506696f688d573702bed2ec3ac14b651cc..48f9620b04ee14e2b52ef13a30186ca47baa78ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,8 @@ ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
 
 FFLIBS-$(CONFIG_AVFILTER) += avfilter
 FFLIBS-$(CONFIG_POSTPROC) += postproc
-FFLIBS-$(CONFIG_SWSCALE)  += swscale
 
-FFLIBS := avdevice avformat avcodec avutil
+FFLIBS := avdevice avformat avcodec avutil swscale
 
 DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
 
@@ -32,10 +31,8 @@ FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS  := $(DEP_LIBS)
 
-ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
 
-INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
 ifneq ($(PROGS),)
 INSTALL_TARGETS-yes             += install-progs install-data
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
@@ -81,41 +78,8 @@ cmdutils.o cmdutils.d: version.h
 
 alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher))
 
-VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
-
-BASEHOOKS = fish null watermark
-ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm
-ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS)))
-
-HOOKS-$(HAVE_FORK)      += ppm
-HOOKS-$(HAVE_IMLIB2)    += imlib2
-HOOKS-$(HAVE_FREETYPE2) += drawtext
-
-HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
-
-VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
-LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs`
-
-VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
-LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`
-
-VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
-
-vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
-
-# vhooks compile fine without libav*, but need them nonetheless.
-videohook: $(FF_DEP_LIBS) $(HOOKS)
-
-$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
-vhook/%$(SLIBSUF): vhook/%.o
-       $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
-
-VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
-depend dep: $(VHOOK_DEPS)
-
 documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
-                                 ffplay-doc.html general.html hooks.html \
-                                 $(ALLMANPAGES))
+                                 ffplay-doc.html general.html $(ALLMANPAGES))
 
 doc/%.html: doc/%.texi
        texi2html -monolithic -number $<
@@ -141,11 +105,7 @@ install-man: $(MANPAGES)
        install -d "$(MANDIR)/man1"
        install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
-install-vhook: videohook
-       install -d "$(SHLIBDIR)/vhook"
-       install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
-
-uninstall: uninstall-progs uninstall-data uninstall-man uninstall-vhook
+uninstall: uninstall-progs uninstall-data uninstall-man
 
 uninstall-progs:
        rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
@@ -156,22 +116,18 @@ uninstall-data:
 uninstall-man:
        rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
-uninstall-vhook:
-       rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
-       -rmdir "$(SHLIBDIR)/vhook/"
-
 testclean:
        rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
 
 clean:: testclean
        rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
-       rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr))
+       rm -f tests/seek_test$(EXESUF)
+       rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
        rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher))
-       rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean::
-       rm -f version.h config.* vhook/*.d
+       rm -f version.h config.*
 
 # regression tests
 
@@ -237,6 +193,7 @@ LAVF_TESTS = $(addprefix regtest-,              \
         asf                                     \
         rm                                      \
         mpg                                     \
+        mxf                                     \
         ts                                      \
         swf                                     \
         ffm                                     \
@@ -267,6 +224,7 @@ LAVF_TESTS = $(addprefix regtest-,              \
         voc                                     \
         ogg                                     \
         pixfmt                                  \
+        pcx                                     \
     )
 
 REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%)))
@@ -280,14 +238,14 @@ LAVF_REG     = tests/data/lavf.regression
 ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
-ifneq ($(CONFIG_SWSCALE),yes)
-servertest codectest $(CODEC_TESTS) libavtest: swscale-error
-swscale-error:
+ifneq ($(CONFIG_ZLIB),yes)
+regtest-flashsv codectest: zlib-error
+endif
+zlib-error:
        @echo
-       @echo "This regression test requires --enable-swscale."
+       @echo "This regression test requires zlib."
        @echo
        @exit 1
-endif
 
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
        diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
@@ -311,7 +269,7 @@ $(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
 
 regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw
 
-$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(EXESUF)
+$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(HOSTEXESUF)
        $(SRC_PATH)/tests/regression.sh $@ vsynth   tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
        $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
@@ -328,24 +286,22 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
        $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
-tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
+tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
        mkdir -p tests/vsynth1
        $(BUILD_ROOT)/$< 'tests/vsynth1/'
 
-tests/vsynth2/00.pgm: tests/rotozoom$(EXESUF)
+tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF)
        mkdir -p tests/vsynth2
        $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
 
-tests/asynth1.sw: tests/audiogen$(EXESUF)
+tests/asynth1.sw: tests/audiogen$(HOSTEXESUF)
        $(BUILD_ROOT)/$< $@
 
-tests/%$(EXESUF): tests/%.c
+tests/%$(HOSTEXESUF): tests/%.c
        $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
 
 tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
-.PHONY: lib videohook documentation *test regtest-* swscale-error alltools check
-
--include $(VHOOK_DEPS)
+.PHONY: documentation *test regtest-* zlib-error alltools check