virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK

Browse Source 
Originally committed as revision 6949 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-11-08 23:18:18 +00:00
parent 1f51da1b4a
commit d226c75084
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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
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

4
configure vendored
View File

@ -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'`

2
libavformat/framehook.c
View File

@ -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;