[SCM] ffmpeg/master: Really build with opencv everywhere

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2260ef1d7f04e4a0ec9677509e744a083a771ed7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 22 08:00:41 2016 +0200

    Really build with opencv everywhere
    
    Closes: #827868

diff --git a/debian/rules b/debian/rules
index 9ee4a45..67fb2ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,8 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	CONFIG += --disable-libx264 --disable-libopencv --disable-frei0r
 else
 	CONFIG += --enable-frei0r \
-		--enable-chromaprint
+		--enable-chromaprint \
+		--enable-libopencv
 
 	# Some libraries are unusable (#792921) on sparc64.
 	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))

-- 
ffmpeg packaging