[SCM] libav/ubuntu: Make clear that is FAAC that's considered non-free, not AAC.

[siretart at users.alioth.debian.org]

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

    Make clear that is FAAC that's considered non-free, not AAC.
    
    (cherry picked from commit 31eec91ca5a755a1d778e8de292665a959b6c5f1)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/debian/confflags b/debian/confflags
index fc1cc7f..6000b9f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -146,7 +146,7 @@ v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libop
 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
+# FAAC is considered non-free upstream
 confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 
 # comment out following line for LGPL versions of the libraries

-- 
Libav/FFmpeg packaging