[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit b3d13ff1a662cd6e9679aee142ecf70fbeb6f4f6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 21 21:15:05 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ca872f2..fc64b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libav (4:0.7.1-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian/unstable
+    - don't build against libfaad, libdirac, librtmp and libopenjpeg
+      (all in universe)
+    - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 21 Jul 2011 21:12:27 +0200
+
 libav (4:0.7.1-1) experimental; urgency=low
 
   [ Andres Mejia ]

-- 
Libav/FFmpeg packaging