[Ffmpeg-cvslog] r6949 - in trunk: Makefile configure libavformat/framehook.c

[mru]

Author: mru
Date: Thu Nov  9 00:18:18 2006
New Revision: 6949

Modified:
   trunk/Makefile
   trunk/configure
   trunk/libavformat/framehook.c

Log:
rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Nov  9 00:18:18 2006
@@ -45,7 +45,7 @@
 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 @@
 ifeq ($(CONFIG_SWSCALER),yes)
 	$(MAKE) -C libswscale  depend
 endif
-ifeq ($(BUILD_VHOOK),yes)
+ifeq ($(CONFIG_VHOOK),yes)
 	$(MAKE) -C vhook       depend
 endif
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Nov  9 00:18:18 2006
@@ -1835,8 +1835,8 @@
   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'`

Modified: trunk/libavformat/framehook.c
==============================================================================
--- trunk/libavformat/framehook.c	(original)
+++ trunk/libavformat/framehook.c	Thu Nov  9 00:18:18 2006
@@ -41,7 +41,7 @@
 /* Returns 0 on OK */
 int frame_hook_add(int argc, char *argv[])
 {
-#ifdef HAVE_VHOOK
+#ifdef CONFIG_VHOOK
     void *loaded;
     FrameHookEntry *fhe, **fhep;