[SCM] multimedia-blends/master: Add ffmpeg back into video & devel tasks

[ross-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1ebef308e43477ff4959874df4d07c18859cb74c
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Thu Jun 11 17:10:05 2015 +0200

    Add ffmpeg back into video & devel tasks

diff --git a/tasks/devel b/tasks/devel
index 75292d1..90205af 100644
--- a/tasks/devel
+++ b/tasks/devel
@@ -173,6 +173,8 @@ Depends: libavcodec-dev, libavdevice-dev, libavfilter-dev, libavformat-dev, liba
 
 Depends: libavc1394-dev
 
+Depends: libavcodec-ffmpeg-dev, libavcodec-ffmpeg56, libavdevice-ffmpeg-dev, libavdevice-ffmpeg56, libavfilter-ffmpeg-dev, libavfilter-ffmpeg5, libavformat-ffmpeg-dev, libavformat-ffmpeg56, libavresample-ffmpeg-dev, libavresample-ffmpeg2, libavutil-ffmpeg-dev, libavutil-ffmpeg54, libpostproc-ffmpeg-dev, libpostproc-ffmpeg53, libswresample-ffmpeg-dev, libswresample-ffmpeg1, libswscale-ffmpeg-dev, libswscale-ffmpeg3
+
 Depends: libbluray-dev, libbluray-bin
 
 Depends: libcoverart-dev
diff --git a/tasks/video b/tasks/video
index da77521..6434a85 100644
--- a/tasks/video
+++ b/tasks/video
@@ -13,6 +13,8 @@ Depends: openshot
 
 Depends: libav-tools
 
+Depends: ffmpeg, qt-faststart
+
 Depends: ffmpeg2theora
 
 Depends: gjacktransport

-- 
multimedia-blends packaging