[SCM] ffmpeg/ubuntu: prepare new upload

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 19a89fc4d7e9f745dd72dcd3bd2c3a55118afb40
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:26:11 2011 +0100

    prepare new upload

diff --git a/debian/changelog b/debian/changelog
index ab1085e..ca589db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libav (4:0.6.2-1ubuntu1) unstable; 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
+    - different arm configure bits that should probably better be merged into debian
+  
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 20 Mar 2011 10:26:02 +0100
+
 libav (4:0.6.2-1) unstable; urgency=medium
 
   [ Reinhard Tartler ]

-- 
Libav/FFmpeg packaging