[vlc-commits] Configure: vaapi and vdpau need avcodec

Jean-Baptiste Kempf git at videolan.org
Tue Mar 12 17:22:52 CET 2013


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 12 17:22:31 2013 +0100| [96e5bb89805b39c210eb2082ab505b574999ba2e] | committer: Jean-Baptiste Kempf

Configure: vaapi and vdpau need avcodec

Should fix distcheck

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96e5bb89805b39c210eb2082ab505b574999ba2e
---

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 52d2341..c08205b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.])
 ])
 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], [
     VLC_SAVE_FLAGS
     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
@@ -2995,7 +2995,7 @@ AC_ARG_ENABLE(vdpau,
   [AS_HELP_STRING([--enable-vdpau],
     [VDPAU hardware decoder support (default auto)])])
 have_vdpau="no"
-AS_IF([test "${enable_vdpau}" != "no"], [
+AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" == "yes"], [
   PKG_CHECK_MODULES([VDPAU], [vdpau], [
     have_vdpau="yes"
     AS_IF([test "${no_x}" = "yes"], [



More information about the vlc-commits mailing list