From d226c75084fa31dc12cbef7657ecbd6f7133d172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 8 Nov 2006 23:18:18 +0000 Subject: [PATCH] rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK Originally committed as revision 6949 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 4 ++-- configure | 4 ++-- libavformat/framehook.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ebcb2d826d..4ad6023bf3 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ else DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) endif -ifeq ($(BUILD_VHOOK),yes) +ifeq ($(CONFIG_VHOOK),yes) VHOOK=videohook INSTALLVHOOK=install-vhook endif @@ -205,7 +205,7 @@ endif ifeq ($(CONFIG_SWSCALER),yes) $(MAKE) -C libswscale depend endif -ifeq ($(BUILD_VHOOK),yes) +ifeq ($(CONFIG_VHOOK),yes) $(MAKE) -C vhook depend endif diff --git a/configure b/configure index 1e06b4940e..dcbaa55bc5 100755 --- a/configure +++ b/configure @@ -1835,8 +1835,8 @@ if test "$have_lrintf" = "yes" ; then echo "#define HAVE_LRINTF 1" >> $TMPH fi if test "$vhook" = "yes" ; then - echo "BUILD_VHOOK=yes" >> config.mak - echo "#define HAVE_VHOOK 1" >> $TMPH + echo "CONFIG_VHOOK=yes" >> config.mak + echo "#define CONFIG_VHOOK 1" >> $TMPH fi sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'` diff --git a/libavformat/framehook.c b/libavformat/framehook.c index e6624e80f8..c85296160b 100644 --- a/libavformat/framehook.c +++ b/libavformat/framehook.c @@ -41,7 +41,7 @@ static FrameHookEntry *first_hook; /* Returns 0 on OK */ int frame_hook_add(int argc, char *argv[]) { -#ifdef HAVE_VHOOK +#ifdef CONFIG_VHOOK void *loaded; FrameHookEntry *fhe, **fhep;