Skip to content
Snippets Groups Projects
Commit 4f3da985 authored by Ramiro Polla's avatar Ramiro Polla
Browse files

Make ppm vhook depend on fork()

Originally committed as revision 9312 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b0268cc0
No related branches found
No related tags found
No related merge requests found
...@@ -1667,6 +1667,8 @@ elif check_func dlopen -ldl; then ...@@ -1667,6 +1667,8 @@ elif check_func dlopen -ldl; then
ldl=-ldl ldl=-ldl
fi fi
check_func fork
test "$vhook" = "default" && vhook="$dlopen" test "$vhook" = "default" && vhook="$dlopen"
enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl
......
...@@ -6,8 +6,12 @@ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libav ...@@ -6,8 +6,12 @@ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libav
-I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
LDFLAGS+= -g LDFLAGS+= -g
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) HOOKS=null$(SLIBSUF) fish$(SLIBSUF) watermark$(SLIBSUF)
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF) ALLHOOKS=$(HOOKS) ppm$(SLIBSUF) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
ifeq ($(HAVE_FORK),yes)
HOOKS += ppm$(SLIBSUF)
endif
ifeq ($(HAVE_IMLIB2),yes) ifeq ($(HAVE_IMLIB2),yes)
HOOKS += imlib2$(SLIBSUF) HOOKS += imlib2$(SLIBSUF)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment