[vlc-devel] commit: --disable-avcodec implies --disable-libva ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jan 9 11:12:18 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan  9 12:08:50 2010 +0200| [f9d095a6a60b2136a378be1bc575ceddfcba1833] | committer: Rémi Denis-Courmont 

--disable-avcodec implies --disable-libva

Don't force an explicit --disable-libva. This was especially silly on
non-libVA platforms.

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

 configure.ac |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8be33c5..431c6a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2978,7 +2978,9 @@ AS_IF([test "${enable_libva}" != "no"], [
               [AC_MSG_WARN([libva not found  ])])
       ])
   ],[
-    AC_MSG_ERROR([libva VAAPI support depends on libavcodec. You cannot use --disable-avcodec.])
+    AS_IF([test "x${enable_libva}" != "x"], [
+      AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
+    ])
   ])
 ])
 




More information about the vlc-devel mailing list