mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK
Originally committed as revision 6949 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1f51da1b4a
commit
d226c75084
4
Makefile
4
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
|
||||
|
||||
|
4
configure
vendored
4
configure
vendored
@ -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'`
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user