[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-1-7-g45b6909

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 45b69093f2efa51f27ae4cb4a6cdb6be08b5e583
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 22 08:57:57 2010 +0200

    Remove obsoleted support for the non-free libamr-nb/wb.

diff --git a/debian/confflags b/debian/confflags
index 20929da..bdd1d75 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -112,12 +112,8 @@ confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
-confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
-
 confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
-confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
-confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
 
 # AAC is considered non-free upstream
 confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)

-- 
FFmpeg packaging