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

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit e4a240dd3c5eb857169bd88fb64a772f2f8bea04
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:48:43 2010 -0400

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 89f420d..75407dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ffmpeg-extra (4:0.6-2ubuntu1) maverick; urgency=low
+
+  * merge from 'main' package. Changes:
+    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 13:04:08 +0200
+
 ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
 
   * merge from debian/experimental. remaining changes:

-- 
FFmpeg packaging