[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit ebd012d76cbaa3e6f8d111a11de3ad1c588bd0d3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 6 15:29:25 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 6539aaa..817fc50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libav (4:0.7-1ubuntu2) oneiric; urgency=low
+
+  * Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 06 Jul 2011 15:29:06 +0200
+
 libav (4:0.7-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian. Remaining changes:

-- 
Libav/FFmpeg packaging