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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5926038b7a13050cfe95b2a1f2f2bd5a81a29e38
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Apr 30 08:13:39 2012 +0200

    temporarily disable opencv to work around dependency troubles

diff --git a/debian/confflags b/debian/confflags
index 614599c..68e210f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -104,7 +104,6 @@ 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 c866920..cdb4d48 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends:
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
- libcv-dev,
  libdc1394-22-dev [linux-any],
  libdirac-dev,
  libfreetype6-dev,
@@ -35,7 +34,6 @@ Build-Depends:
  libmp3lame-dev,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
- libopencv-dev,
  libopenjpeg-dev,
  libpulse-dev [!hurd-any],
  libraw1394-dev [linux-any],

-- 
Libav/FFmpeg packaging