[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 225f12a885cfa55f7b17fee9b20e78c1b3e36a24
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 27 19:28:22 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index a0312db..e17dc83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libav (4:0.7~beta2-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - don't build against libfaad, libdirac, librtmp and libopenjpeg
+      (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 27 May 2011 19:27:07 +0200
+
 libav (4:0.7~beta2-2) experimental; urgency=low
 
   * refresh patches

-- 
Libav/FFmpeg packaging