[SCM] x264/ubuntu: link x264cli explicitly against lavf

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit df87dd6d94bd60162194fdc14e0cfd37c25b9b32
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Nov 10 08:06:52 2010 +0100

    link x264cli explicitly against lavf

diff --git a/debian/patches/link-x264cli-explicitly-against-lavf.patch b/debian/patches/link-x264cli-explicitly-against-lavf.patch
new file mode 100644
index 0000000..349738e
--- /dev/null
+++ b/debian/patches/link-x264cli-explicitly-against-lavf.patch
@@ -0,0 +1,18 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Subject: link x264cli explicitly against lavf
+
+diff --git a/configure b/configure
+index 24d15ad..6e78aaa 100755
+--- a/configure
++++ b/configure
+@@ -567,7 +567,9 @@ if [ "$ffms" = "yes" ]; then
+     LDFLAGSCLI="$FFMS2_LIBS $LDFLAGSCLI"
+     [ -n "$FFMS2_CFLAGS" ] && CFLAGS="$CFLAGS $FFMS2_CFLAGS"
+     define HAVE_FFMS
+-elif [ "$lavf" = "yes" ]; then
++fi
++
++if [ "$lavf" = "yes" ]; then
+     LDFLAGSCLI="$LAVF_LIBS $LDFLAGSCLI"
+     [ -n "$LAVF_CFLAGS" ] && CFLAGS="$CFLAGS $LAVF_CFLAGS"
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..5a237f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+link-x264cli-explicitly-against-lavf.patch
 

-- 
x264 packaging