[SCM] vlc/master: Remove libav*-ffmpeg-dev from B-D again

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit af990f082b42bd14dd64f6daed6c0ba88cc63ece
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jul 26 23:43:36 2015 +0200

    Remove libav*-ffmpeg-dev from B-D again
    
    libav*-dev is now shipped by ffmpeg.

diff --git a/debian/control b/debian/control
index 08c153e..7422c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Build-Depends: autopoint,
                libass-dev (>= 0.9.8),
                libavahi-client-dev,
                libavc1394-dev (>= 0.5.3) [linux-any],
-               libavcodec-dev (>= 6:9) | libavcodec-ffmpeg-dev,
-               libavformat-dev (>= 4:0.6) | libavformat-ffmpeg-dev,
+               libavcodec-dev (>= 6:9),
+               libavformat-dev (>= 4:0.6),
                libbluray-dev (>= 1:0.3.0),
                libcaca-dev (>= 0.99.beta4),
                libcairo2-dev (>= 1.13.1),
@@ -86,7 +86,7 @@ Build-Depends: autopoint,
                libspeex-dev (>= 1.0.5),
                libspeexdsp-dev (>= 1.0.5),
                libssh2-1-dev,
-               libswscale-dev (>= 4:0.6) | libswscale-ffmpeg-dev,
+               libswscale-dev (>= 4:0.6),
                libtag1-dev (>= 1.9),
                libtheora-dev (>= 1.0),
                libtwolame-dev (>= 0.3.8),

-- 
VLC media player packaging