Skip to content

V
vlc-2-2
Commit 9f5b5496 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Don't error out if --disable-avcodec was specified but not --disable-libva

parent 6f2f2843
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
configure.ac
View file @ 9f5b5496
...@@ -2470,11 +2470,10 @@ dnl ...@@ -2470,11 +2470,10 @@ dnl
AC_ARG_ENABLE(libva, AC_ARG_ENABLE(libva,
[ --enable-libva VAAPI GPU decoding support (libVA) (default auto)]) [ --enable-libva VAAPI GPU decoding support (libVA) (default auto)])
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.])
])
AS_IF([test "${enable_libva}" != "no"], [ AS_IF([test "${enable_libva}" != "no"], [
AS_IF([test "${have_avcodec}" != "yes"], [
AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
])
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}"
......
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