[SCM] libav/master: Reenable opencv again

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 62b1db59c68209f14b05c5451f9688a6d0998cfd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 8 23:27:53 2014 -0400

    Reenable opencv again
    
    Now that #737584 is fixed, the package should build again

diff --git a/debian/confflags b/debian/confflags
index 905605b..3adedd0 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -122,8 +122,7 @@ confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
 confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
 confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
-# disabled because of #737584
-#confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
+confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
 confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 confflags += $(call cond_enable,/usr/include/opus/opus.h,libopus)
 confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)

-- 
Libav/FFmpeg packaging