[SCM] vlc/master: Add FFmpeg libraries as alternative build dependencies to libav.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8b803e86e8fc96291067d2ab5d641946eb1d2610
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon May 12 22:25:43 2014 +0200

    Add FFmpeg libraries as alternative build dependencies to libav.

diff --git a/debian/control b/debian/control
index 8fe4ae4..84b78e0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends: autopoint,
                libass-dev (>= 0.9.8),
                libavahi-client-dev,
                libavc1394-dev (>= 0.5.3) [linux-any],
-               libavcodec-dev (>= 4:0.6),
-               libavformat-dev (>= 4:0.6),
+               libavcodec-dev (>= 4:0.6) | libavcodec-ffmpeg-dev,
+               libavformat-dev (>= 4:0.6) | libavformat-ffmpeg-dev,
                libbluray-dev (>= 1:0.2.1),
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
@@ -80,7 +80,7 @@ Build-Depends: autopoint,
                libspeex-dev (>= 1.0.5),
                libspeexdsp-dev (>= 1.0.5),
                libssh2-1-dev,
-               libswscale-dev (>= 4:0.6),
+               libswscale-dev (>= 4:0.6) | libswscale-ffmpeg-dev,
                libtag1-dev (>= 1.6.1),
                libtar-dev,
                libtheora-dev (>= 1.0),

-- 
VLC media player packaging