[SCM] libav/ubuntu: Enable tls support through gnutls.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 842d01d5d7118273d30750768ca1033b08a95a8a
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 15:10:00 2012 -0400

    Enable tls support through gnutls.
    
    (cherry picked from commit 2d755101073ced592c82280431709653b48cbf49)
    
    Conflicts:
    
    	debian/confflags

diff --git a/debian/confflags b/debian/confflags
index 06a928d..9aab81f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -99,6 +99,7 @@ confflags += --prefix=/usr
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --enable-vdpau
 confflags += --enable-bzlib
+confflags += --enable-gnutls
 confflags += --enable-libgsm
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
diff --git a/debian/control b/debian/control
index 86d4aec..d26d462 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends:
  libbz2-dev,
  libdc1394-22-dev [linux-any],
  libfreetype6-dev,
+ libgnutls-dev,
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev [!hurd-i386],

-- 
Libav/FFmpeg packaging