[SCM] ffmpeg/master: Build with opencv everywhere

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 05259d74326295ba6fb20930dba104f93ebdbf71
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon May 2 20:33:53 2016 +0200

    Build with opencv everywhere

diff --git a/debian/control b/debian/control
index cf450fa..079e568 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Build-Depends:
 # --enable-libopencore_amrwb
  libopencore-amrwb-dev,
 # --enable-libopencv
- libopencv-dev [!sh4 !sparc64] <!stage1>,
+ libopencv-dev <!stage1>,
 # --enable-libopenjpeg
  libopenjpeg-dev,
 # --enable-libopus
diff --git a/debian/rules b/debian/rules
index 627f01d..d41de51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,11 +148,6 @@ else
 	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
 		CONFIG += --enable-libx264
 	endif
-
-	# OpenCV is not available on some architectures.
-	ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64))
-		CONFIG += --enable-libopencv
-	endif
 endif
 
 # Disable i686 optimizations on i386, because they are not always available on this architecture.

-- 
ffmpeg packaging