[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-5-g21da6f2

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 21da6f23f87fa9e680bd71b7be4759a1d8212b89
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:01:14 2010 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 60e1d73..7b18713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ffmpeg (4:0.5.1-4) UNRELEASED; urgency=low
 
+  [ Andres Mejia ]
   * Fix dependency problem for ffmpeg so it can use extra ffmpeg libs.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 03:19:37 -0400
+  [ Reinhard Tartler ]
+  * move presets back to 'ffmpeg' package. Closes: #581748
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 May 2010 23:01:08 +0200
 
 ffmpeg (4:0.5.1-3) unstable; urgency=low
 

-- 
FFmpeg packaging