[SCM] bs1770gain/master: Change order of avformat build dependency to prefer the ffmpeg version now the primary version in Debian unstable.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b15bb747c10050d11880775b6994f4590fe5db51
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Dec 19 13:39:54 2015 +0100

    Change order of avformat build dependency to prefer the ffmpeg version now the primary version in Debian unstable.

diff --git a/debian/control b/debian/control
index a231cb5..e555beb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>
 Build-depends: debhelper (>> 9)
  , dh-autoreconf
  , libsox-dev
- , libavformat-dev (>= 7:2.7.0) | libavformat-ffmpeg-dev
+ , libavformat-ffmpeg-dev | libavformat-dev (>= 7:2.7.0)
  , sox
 Standards-Version: 3.9.6
 Homepage: http://bs1770gain.sourceforge.net/

-- 
bs1770gain packaging