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
9840130e
Commit
9840130e
authored
12 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
configure: Simplify VDA header and extralibs check
parent
0a8da1a3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+2
-5
2 additions, 5 deletions
configure
with
2 additions
and
5 deletions
configure
+
2
−
5
View file @
9840130e
...
@@ -1608,6 +1608,7 @@ zmbv_encoder_select="zlib"
...
@@ -1608,6 +1608,7 @@ zmbv_encoder_select="zlib"
# hardware accelerators
# hardware accelerators
vaapi_deps
=
"va_va_h"
vaapi_deps
=
"va_va_h"
vda_deps
=
"VideoDecodeAcceleration_VDADecoder_h pthreads"
vda_deps
=
"VideoDecodeAcceleration_VDADecoder_h pthreads"
vda_extralibs
=
"-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
vdpau_deps
=
"vdpau_vdpau_h vdpau_vdpau_x11_h"
vdpau_deps
=
"vdpau_vdpau_h vdpau_vdpau_x11_h"
h263_vaapi_hwaccel_select
=
"vaapi h263_decoder"
h263_vaapi_hwaccel_select
=
"vaapi h263_decoder"
...
@@ -3434,6 +3435,7 @@ check_header sys/time.h
...
@@ -3434,6 +3435,7 @@ check_header sys/time.h
check_header unistd.h
check_header unistd.h
check_header vdpau/vdpau.h
check_header vdpau/vdpau.h
check_header vdpau/vdpau_x11.h
check_header vdpau/vdpau_x11.h
check_header VideoDecodeAcceleration/VDADecoder.h
check_header windows.h
check_header windows.h
check_header X11/extensions/XvMClib.h
check_header X11/extensions/XvMClib.h
...
@@ -3586,11 +3588,6 @@ require X11 X11/Xlib.h XOpenDisplay -lX11 &&
...
@@ -3586,11 +3588,6 @@ require X11 X11/Xlib.h XOpenDisplay -lX11 &&
require Xext X11/extensions/XShm.h XShmCreateImage
-lXext
&&
require Xext X11/extensions/XShm.h XShmCreateImage
-lXext
&&
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage
-lXfixes
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage
-lXfixes
# check for VDA header
if
!
disabled vda
&&
check_header VideoDecodeAcceleration/VDADecoder.h
;
then
enable
vda
&&
add_extralibs
-framework
CoreFoundation
-framework
VideoDecodeAcceleration
-framework
QuartzCore
fi
if
!
disabled vdpau
&&
enabled vdpau_vdpau_h
;
then
if
!
disabled vdpau
&&
enabled vdpau_vdpau_h
;
then
check_cpp_condition vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
check_cpp_condition vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
{
echolog
"Please upgrade to libvdpau >= 0.2 if you would like vdpau support."
&&
disable vdpau
;
}
{
echolog
"Please upgrade to libvdpau >= 0.2 if you would like vdpau support."
&&
disable vdpau
;
}
...
...
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