Commit 10fe48b7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

configure: look for libvdpau regardless of libavcodec

This uncomments the configure checks for HAVE_VDPAU. That way VDPAU can
be used even if libavcodec is missing or old.
parent 9d29844f
...@@ -3038,31 +3038,30 @@ AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) ...@@ -3038,31 +3038,30 @@ AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
dnl dnl
dnl VDPAU needs X11 and avcodec dnl VDPAU needs X11
dnl dnl
AC_ARG_ENABLE(vdpau, AC_ARG_ENABLE(vdpau,
[AS_HELP_STRING([--enable-vdpau], [AS_HELP_STRING([--enable-vdpau], [VDPAU hardware support (default auto)])])
[VDPAU hardware decoder support (default auto)])])
have_vdpau="no" have_vdpau="no"
AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" = "yes"], [ AS_IF([test "${enable_vdpau}" != "no"], [
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"], [
AC_MSG_ERROR([VDPAU requires Xlib (X11).]) AC_MSG_ERROR([VDPAU requires Xlib (X11).])
]) ])
AC_MSG_NOTICE([VDPAU acceleration activated])
], [ ], [
AS_IF([test -n "${enable_vdpau}"], [ AS_IF([test -n "${enable_vdpau}"], [
AC_MSG_ERROR([${VDPAU_PKG_ERRORS}.]) AC_MSG_ERROR([${VDPAU_PKG_ERRORS}.])
]) ])
]) ])
]) ])
dnl AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"]) AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"])
have_avcodec_vdpau="no" have_avcodec_vdpau="no"
AS_IF([test "${have_vdpau}" = "yes"], [ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [ PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [
have_avcodec_vdpau="yes" have_avcodec_vdpau="yes"
AC_MSG_NOTICE([VDPAU decoding acceleration activated])
], [ ], [
AS_IF([test -n "${enable_vdpau}"], [ AS_IF([test -n "${enable_vdpau}"], [
AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.]) AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.])
......
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