[SCM] audacity/master: Disable ffmpeg support

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 36289c7ee90c8cf824483ca708456ffa7eb4f563
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 14 14:48:43 2013 +0200

    Disable ffmpeg support
    
    Until audacity is ported to libav 9, we need to disable ffmpeg support.

diff --git a/debian/control b/debian/control
index 14d2b7a..689e9b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: autoconf,
                dh-autoreconf,
                gettext,
                libasound2-dev [linux-any],
-               libavcodec-dev (>= 4:0.6),
-               libavformat-dev (>= 4:0.6),
-               libavutil-dev (>= 4:0.6),
+#              libavcodec-dev (>= 4:0.6),
+#              libavformat-dev (>= 4:0.6),
+#              libavutil-dev (>= 4:0.6),
                libexpat1-dev,
                libflac++-dev,
                libgtk2.0-dev,
diff --git a/debian/rules b/debian/rules
index b22ab30..0b05d65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ configure_flags := \
 	LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,--as-needed" \
 	--disable-dynamic-loading \
 	--with-expat=system \
-	--with-ffmpeg=system \
+	--without-ffmpeg \
 	--with-lame=system \
 	--with-libflac=system \
 	--with-libid3tag=system \

-- 
Audacity debian packaging