[SCM] x264/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 55346e531eb19474ebb2faa6f74dea754e8ae699
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 29 17:46:56 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index b6e7542..318e307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+x264 (2:0.118.2085+git8a62835-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian, 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>  Sat, 29 Oct 2011 17:46:52 +0200
+
 x264 (2:0.118.2085+git8a62835-1) unstable; urgency=low
 
   * Team upload.

-- 
x264 packaging