[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-33-g141ca8c

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 53338f3d62d6099ee17dea3ced71e81d3350e904
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:29:12 2009 +0100

    simplify checking if libfaad is available or not

diff --git a/debian/confflags b/debian/confflags
index 15e3fc6..736a664 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -30,17 +30,9 @@ gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
 # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
-HAVE_LIBFAAD = no
-ifeq ($(ubuntu),)
-HAVE_LIBFAAD = yes
-endif
-ifneq ($(DEB_SOURCE),ffmpeg-debian)
-HAVE_LIBFAAD = yes
-endif
-
-ifeq ($(HAVE_LIBFAAD),yes)
-gpl_confflags += --enable-libfaad
-endif
+HAVE_LIBFAAD := $(shell stat /usr/include/faad.h >/dev/null 2>/dev/null && \
+                        echo --enable-libfaad )
+gpl_confflags += $(HAVE_LIBFAAD)
 
 # Common configuration flags; comment out following line for LGPL versions of
 # the libraries

-- 
FFmpeg packaging