[SCM] libav/master: Revert "temporarily disable opencv to work around dependency troubles"

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

The following commit has been merged in the master branch:
commit 2c84cb0fe83e14dc94653da48b7baa201eafe38d
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue May 1 21:32:52 2012 -0400

    Revert "temporarily disable opencv to work around dependency troubles"
    
    This reverts commit 5926038b7a13050cfe95b2a1f2f2bd5a81a29e38.

diff --git a/debian/confflags b/debian/confflags
index 49b5cac..6c78316 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -103,6 +103,7 @@ confflags += --enable-frei0r
 confflags += --enable-gnutls
 confflags += --enable-libcdio
 confflags += --enable-libgsm
+confflags += --enable-libopencv
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
diff --git a/debian/control b/debian/control
index bee330c..7157b9e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends:
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
+ libcv-dev,
  libdc1394-22-dev [linux-any],
  libdirac-dev,
  libfreetype6-dev,
@@ -34,6 +35,7 @@ Build-Depends:
  libmp3lame-dev,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
+ libopencv-dev,
  libopenjpeg-dev,
  libpulse-dev,
  libraw1394-dev [linux-any],

-- 
Libav/FFmpeg packaging