[SCM] forked-daapd/master: Revert "Switch to ffmpeg"

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 637554a7dfcd6c7842142b9b4a661e029c6bff31
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Jun 30 15:49:23 2015 -0500

    Revert "Switch to ffmpeg"
    
    This reverts commit 48bc645422da85260634c77e449985e4ab10215c.

diff --git a/debian/control b/debian/control
index e3a363d..88b5d4e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
 Build-Depends: debhelper (>= 9~),
- libavcodec-ffmpeg-dev,
- libavformat-ffmpeg-dev,
- libswscale-ffmpeg-dev,
- libavutil-ffmpeg-dev,
- libavresample-ffmpeg-dev,
+ libavcodec-dev (>= 3:0.svn20090204),
+ libavformat-dev (>= 3:0.svn20090204),
+ libswscale-dev,
+ libavutil-dev,
+ libavresample-dev,
  libavahi-client-dev,
  libsqlite3-dev (>= 3.6.23.1-2),
  libconfuse-dev,

-- 
forked-daapd packaging