Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
4f3da985
Commit
4f3da985
authored
17 years ago
by
Ramiro Polla
Browse files
Options
Downloads
Patches
Plain Diff
Make ppm vhook depend on fork()
Originally committed as revision 9312 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
b0268cc0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+2
-0
2 additions, 0 deletions
configure
vhook/Makefile
+6
-2
6 additions, 2 deletions
vhook/Makefile
with
8 additions
and
2 deletions
configure
+
2
−
0
View file @
4f3da985
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
vhook/Makefile
+
6
−
2
View file @
4f3da985
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment