[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 77e3fd2b00d8e254ea1322d4e9b74d1af96872ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 21:03:53 2010 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c80c092..e0d1618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ffmpeg-extra (4:0.6.1-1ubuntu1) natty; urgency=low
+
+  * merge from 'main' package. Changes:
+    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 21:03:40 +0100
+
 ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
 
   * Merge from debian. Remaining changes:

-- 
FFmpeg packaging