[SCM] libav/ubuntu: Include conditional enablers for vo-aacenc and vo-amrwbenc.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 79c216604e706b8a0d9b94302ec0e8ca3ada02cb
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 16:35:15 2012 -0400

    Include conditional enablers for vo-aacenc and vo-amrwbenc.
    
    (cherry picked from commit 4b32d5fa1286de2f9f84a815ab1b196970e2c7df)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/debian/confflags b/debian/confflags
index 5b66b03..c594e91 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -143,6 +143,8 @@ confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 # Opencore-amr requires GPL v3
 v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
 v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+v3_confflags += $(call cond_enable_v3,/usr/include/vo-aacenc/voAAC.h,libvo-aacenc)
+v3_confflags += $(call cond_enable_v3,/usr/include/vo-amrwbenc/enc_if.h,libvo-amrwbenc)
 
 # AAC is considered non-free upstream
 confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)

-- 
Libav/FFmpeg packaging