Commit b3d2ee43 authored by mru's avatar mru

rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6949 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5bd6011d
...@@ -45,7 +45,7 @@ else ...@@ -45,7 +45,7 @@ else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
endif endif
ifeq ($(BUILD_VHOOK),yes) ifeq ($(CONFIG_VHOOK),yes)
VHOOK=videohook VHOOK=videohook
INSTALLVHOOK=install-vhook INSTALLVHOOK=install-vhook
endif endif
...@@ -205,7 +205,7 @@ endif ...@@ -205,7 +205,7 @@ endif
ifeq ($(CONFIG_SWSCALER),yes) ifeq ($(CONFIG_SWSCALER),yes)
$(MAKE) -C libswscale depend $(MAKE) -C libswscale depend
endif endif
ifeq ($(BUILD_VHOOK),yes) ifeq ($(CONFIG_VHOOK),yes)
$(MAKE) -C vhook depend $(MAKE) -C vhook depend
endif endif
......
...@@ -1835,8 +1835,8 @@ if test "$have_lrintf" = "yes" ; then ...@@ -1835,8 +1835,8 @@ if test "$have_lrintf" = "yes" ; then
echo "#define HAVE_LRINTF 1" >> $TMPH echo "#define HAVE_LRINTF 1" >> $TMPH
fi fi
if test "$vhook" = "yes" ; then if test "$vhook" = "yes" ; then
echo "BUILD_VHOOK=yes" >> config.mak echo "CONFIG_VHOOK=yes" >> config.mak
echo "#define HAVE_VHOOK 1" >> $TMPH echo "#define CONFIG_VHOOK 1" >> $TMPH
fi fi
sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'` sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
......
...@@ -41,7 +41,7 @@ static FrameHookEntry *first_hook; ...@@ -41,7 +41,7 @@ static FrameHookEntry *first_hook;
/* Returns 0 on OK */ /* Returns 0 on OK */
int frame_hook_add(int argc, char *argv[]) int frame_hook_add(int argc, char *argv[])
{ {
#ifdef HAVE_VHOOK #ifdef CONFIG_VHOOK
void *loaded; void *loaded;
FrameHookEntry *fhe, **fhep; FrameHookEntry *fhe, **fhep;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment