[SCM] ffmpeg/ubuntu: minimize diff to debian package

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit dab28bc3b29224e437cf00d61ad70e3d54898dea
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 12:01:34 2011 +0100

    minimize diff to debian package

diff --git a/debian/confflags b/debian/confflags
index d597414..6d14723 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -7,10 +7,10 @@ FLAVORS := static
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS += shared
 
-export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
 
@@ -136,6 +136,10 @@ gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 
 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)
+
 # AAC is considered non-free upstream
 confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 

-- 
Libav/FFmpeg packaging