[SCM] libav/ubuntu: Enable opencv support.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 5aa41c55a8a65032bf89486ade1e5162d023ee28
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 15:47:50 2012 -0400

    Enable opencv support.
    
    (cherry picked from commit 3d412a4603539cb4471bc530ed02b58da53e3643)
    
    Conflicts:
    
    	debian/control

diff --git a/debian/confflags b/debian/confflags
index a597e39..cfb8b0f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -102,6 +102,7 @@ confflags += --enable-bzlib
 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 e41b035..ee68a30 100644
--- a/debian/control
+++ b/debian/control
@@ -24,12 +24,14 @@ Build-Depends:
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
+ libcv-dev,
  libdc1394-22-dev [linux-any],
  libfreetype6-dev,
  libgnutls-dev,
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev [!hurd-i386],
+ libopencv-dev,
  libraw1394-dev [linux-any],
  libschroedinger-dev,
  libsdl1.2-dev,

-- 
Libav/FFmpeg packaging