[SCM] libav/master: Enable vaapi for all architectures. libva is available on all architectures.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b6929c2a90bfca89a999191715c0517a3a849771
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 16:08:44 2012 -0400

    Enable vaapi for all architectures.
    libva is available on all architectures.

diff --git a/debian/confflags b/debian/confflags
index 96a43e6..69e7016 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -97,6 +97,7 @@ confflags += --extra-version='$(DEB_VERSION)'
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --prefix=/usr
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+confflags += --enable-vaapi
 confflags += --enable-vdpau
 confflags += --enable-bzlib
 confflags += --enable-frei0r
@@ -125,9 +126,6 @@ endif
 
 confflags += $(extra_common_confflags)
 
-# vaapi is not available on s390 and on the hurd
-confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
-
 # pulse is not available on the hurd
 confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
 
diff --git a/debian/control b/debian/control
index aa59534..14d3fbe 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
  libtiff4-dev | libtiff-dev,
- libva-dev [!hurd-i386],
+ libva-dev,
  libvdpau-dev,
  libvorbis-dev,
  libvpx-dev,

-- 
Libav/FFmpeg packaging