Skip to content

V
vlc-2-2
Commit 96e5bb89 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Configure: vaapi and vdpau need avcodec 

Should fix distcheck
parent faa89b54
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.ac
View file @ 96e5bb89
...@@ -2258,7 +2258,7 @@ AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [ ...@@ -2258,7 +2258,7 @@ AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [
AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.]) AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.])
]) ])
have_avcodec_vaapi="no" have_avcodec_vaapi="no"
AS_IF([test "${enable_libva}" != "no"], [ AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" == "yes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
...@@ -2995,7 +2995,7 @@ AC_ARG_ENABLE(vdpau, ...@@ -2995,7 +2995,7 @@ AC_ARG_ENABLE(vdpau,
[AS_HELP_STRING([--enable-vdpau], [AS_HELP_STRING([--enable-vdpau],
[VDPAU hardware decoder support (default auto)])]) [VDPAU hardware decoder support (default auto)])])
have_vdpau="no" have_vdpau="no"
AS_IF([test "${enable_vdpau}" != "no"], [ AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" == "yes"], [
PKG_CHECK_MODULES([VDPAU], [vdpau], [ PKG_CHECK_MODULES([VDPAU], [vdpau], [
have_vdpau="yes" have_vdpau="yes"
AS_IF([test "${no_x}" = "yes"], [ AS_IF([test "${no_x}" = "yes"], [
......
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