[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.6.svn20100505-1ubuntu1

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 866797b819ebb03ada0ca5b86d65502ea81a6cad
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:49:37 2010 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 09fa4e7..2726ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
+
+  * merge from 'main' package. Changes
+    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 07:49:18 +0200
+
 ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 
   * merge from debian/experimental. remaining changes:

-- 
FFmpeg packaging