[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 873c92e8d235ef506ac1505c9c20f334d45440e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 17:21:47 2010 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 925dad3..9b835b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+    - explicitly --enable-pic on powerpc, cf. LP: #654666
+  * remove fix-CVE-2010-3429.patch, applied upstream
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 12:19:50 +0100
+
 ffmpeg (4:0.6.1-1) experimental; urgency=low
 
   * Imported Upstream version 0.6.1

-- 
FFmpeg packaging