[SCM] libav/ubuntu: Update comment about GPLv3 features.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 6578f1f92aae31bcd118ed96c995c00d54f77eb0
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 16:36:21 2012 -0400

    Update comment about GPLv3 features.
    
    (cherry picked from commit f170e9200e0f2563a783b9555b2bfb2430d898ee)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/debian/confflags b/debian/confflags
index c594e91..fc1cc7f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -140,7 +140,7 @@ gpl_confflags += $(call cond_enable,/usr/include/opencv/cv.h,libopencv)
 
 confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 
-# Opencore-amr requires GPL v3
+# Features that require 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)

-- 
Libav/FFmpeg packaging