[SCM] x264/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 833a2a9e067676534741770be215fc84daba6489
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 9 21:58:08 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 500c9d7..99d7bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+x264 (2:0.116.2042+git178455c-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian (seriously!), remaining changes
+    - tighten dependencies on Libav 0.7
+    - Build against libffms2-dev
+    - build against libgpac-dev to enable .mp4 output
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 09 Aug 2011 21:57:53 +0200
+
 x264 (2:0.116.2042+git178455c-1) unstable; urgency=low
 
   * New upstream snapshot.

-- 
x264 packaging