[SCM] ffmpeg/master: Switch to SDL 2.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dfe2689c05be0be9ba3b4773cea360e614dfcb2e
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 29 19:18:10 2016 +0200

    Switch to SDL 2.

diff --git a/debian/control b/debian/control
index 313fc41..de416fb 100644
--- a/debian/control
+++ b/debian/control
@@ -98,8 +98,8 @@ Build-Depends:
  libschroedinger-dev,
 # autodetected: protocol 'sctp'
  libsctp-dev [linux-any],
-# autodetected: SDL support
- libsdl-dev,
+# --enable-sdl2
+ libsdl2-dev,
 # --enable-libshine
  libshine-dev (>= 3.0.0),
 # --enable-libsnappy
diff --git a/debian/rules b/debian/rules
index fdd5596..50f7bc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ CONFIG := --prefix=/usr \
 	--enable-libzvbi \
 	--enable-openal \
 	--enable-opengl \
+	--enable-sdl2 \
 	--enable-x11grab
 
 # The standard configuration only uses the shared CONFIG.

-- 
ffmpeg packaging