Skip to content

Commit

Permalink
ffmpeg: use pkg-config to check for VA-API.
Browse files Browse the repository at this point in the history
Fix build with VA-API installation into non-standard locations.
e.g. /opt/libva/<branch>/ used as a prefix.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
  • Loading branch information
gbeauchesne committed Aug 17, 2012
1 parent f4492f8 commit 97cd8af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ffmpeg/configure
Expand Up @@ -3111,7 +3111,7 @@ done


check_lib math.h sin -lm && LIBM="-lm" check_lib math.h sin -lm && LIBM="-lm"
disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
enabled vaapi && require vaapi va/va.h vaInitialize -lva enabled vaapi && require_pkg_config libva va/va.h vaInitialize -lva


check_mathfunc cbrtf check_mathfunc cbrtf
check_mathfunc exp2 check_mathfunc exp2
Expand Down Expand Up @@ -3256,7 +3256,7 @@ check_func XShmCreateImage -lX11 -lXext &&
check_func XFixesGetCursorImage -lX11 -lXext -lXfixes check_func XFixesGetCursorImage -lX11 -lXext -lXfixes


if ! disabled vaapi; then if ! disabled vaapi; then
check_lib va/va.h vaInitialize -lva && { check_pkg_config libva va/va.h vaInitialize && {
check_cpp_condition va/va_version.h "VA_CHECK_VERSION(0,32,0)" || check_cpp_condition va/va_version.h "VA_CHECK_VERSION(0,32,0)" ||
warn "Please upgrade to VA-API >= 0.32 if you would like full VA-API support."; warn "Please upgrade to VA-API >= 0.32 if you would like full VA-API support.";
} || disable vaapi } || disable vaapi
Expand Down

0 comments on commit 97cd8af

Please sign in to comment.