[SCM] ffmpeg/master: Work in master

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2901a0137e9514cf0163e547d6b5bc82726bb07
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Apr 17 19:21:59 2016 +0200

    Work in master

diff --git a/debian/control b/debian/control
index df796db..cf450fa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>,
  Balint Reczey <balint at balintreczey.hu>
 Homepage: https://ffmpeg.org/
 Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/ffmpeg.git -b experimental
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/ffmpeg.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/ffmpeg.git
 Build-Depends-Indep:
 # needed to minify the CSS files
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 16327d3..1270436 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = experimental
-upstream-branch = upstream-experimental
+debian-branch = master
+upstream-branch = upstream

-- 
ffmpeg packaging