[SCM] ffmpeg/ubuntu.extra: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 89b0b08109a323e2d6802dc1540741d182a5680c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:15:29 2010 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 28051de..09d522a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ffmpeg-extra (4:0.6.1-2ubuntu1) natty; urgency=low
+
+  * merge from 'main' package. Changes:
+    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+  * force upgrade of the mplayer package
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 19 Nov 2010 12:15:19 +0100
+
 ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low
 
   * Merge from debian. Remaining changes:

-- 
FFmpeg packaging