[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit a0c6659fcf20bd322bbe2a4ac9c4ad96827100ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 26 11:13:17 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d41976f..cd34299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libav (4:0.7.1-3ubuntu1) oneiric; urgency=low
+
+  * Merge from debian/unstable
+    - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+      lame, xvid, x264  (all in universe)
+  * Drop extra conflicts on libswscale-extra-1
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 26 Aug 2011 11:12:43 +0200
+
 libav (4:0.7.1-3) experimental; urgency=low
 
   * add post 0.7.1 patches

-- 
Libav/FFmpeg packaging