Skip to content

V
vlc
Commit d1e7a6e5 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Fix libavcodec/vaapi.h detection.

parent 3a9b3839
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
configure.ac
View file @ d1e7a6e5
...@@ -2851,6 +2851,9 @@ AS_IF([test "${enable_libva}" != "no"], [ ...@@ -2851,6 +2851,9 @@ AS_IF([test "${enable_libva}" != "no"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [ AS_IF([test "x${have_avcodec}" = "xyes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11], PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
[ [
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
AC_CHECK_HEADERS(libavcodec/vaapi.h, [ AC_CHECK_HEADERS(libavcodec/vaapi.h, [
VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS]) VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS]) VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
...@@ -2861,6 +2864,7 @@ AS_IF([test "${enable_libva}" != "no"], [ ...@@ -2861,6 +2864,7 @@ AS_IF([test "${enable_libva}" != "no"], [
[AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])], [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
[AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])]) [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
]) ])
VLC_RESTORE_FLAGS
],[ ],[
AS_IF([test "${enable_libva}" == "yes"], AS_IF([test "${enable_libva}" == "yes"],
[AC_MSG_ERROR([Could not find required libva.])], [AC_MSG_ERROR([Could not find required libva.])],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment