[SCM] gmerlin-encoders/master.ubuntu: Update

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 3e1d168eb38d8303a2ac773a4712752e9f1f252b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 30 11:22:17 2011 +0200

    Update

diff --git a/debian/changelog b/debian/changelog
index 2712fd7..44ccc75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ gmerlin-encoders (1.0.0-3ubuntu1) oneiric; urgency=low
     - Remaining changes:
       + Build-Depends on libmjpegtool-dev.
       + Add gmerlin-encoders-extra to provide more non-free encoders.
+      + Take patch from upstream SVN trunk to fix FTBFS with libav.
 
- -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 30 Jul 2011 10:53:24 +0200
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 30 Jul 2011 11:22:04 +0200
 
 gmerlin-encoders (1.0.0-3) unstable; urgency=low
 

-- 
gmerlin-encoders packaging