[SCM] ffmpeg/master: Remove patches included upstream

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 988fc0c982eeee26269a1b5a3665bc06607996f4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 10 19:48:56 2016 +0200

    Remove patches included upstream

diff --git a/debian/patches/Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch b/debian/patches/Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch
deleted file mode 100644
index 99c284c..0000000
--- a/debian/patches/Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f9a150fc31c5336a8d51bc51a921d1f9885d5876 Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial at gmail.com>
-Date: Sat, 9 Jul 2016 16:00:06 -0300
-Subject: [PATCH] =?UTF-8?q?Revert=20"configure:=20Enable=20GCC=20vectoriza?=
- =?UTF-8?q?tion=20on=20=E2=89=A54.9=20on=20x86"?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit cb8646af24bd8e9627cc5e1c62b049a00fe0b07b.
-
-This change has brough more issues than benefits, between compilation
-time failures depending on flags used and code miscompilation causing
-runtime crashes.
-
-See the "[PATCH 2/2] configure: Enable GCC vectorization on ≥4.9"
-thread in the ffmpeg-devel mailing list for the relevant discussion.
-
-(cherry picked from commit fd6dbc53855fbfc9a782095d0ffe11dd3a98905f)
----
- configure | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index 3760641..adb4c27 100755
---- a/configure
-+++ b/configure
-@@ -6125,11 +6125,7 @@ elif enabled ccc; then
-     add_cflags -msg_disable nonstandcast
-     add_cflags -msg_disable unsupieee
- elif enabled gcc; then
--    case $gcc_basever in
--        4.9*) enabled x86 || check_optflags -fno-tree-vectorize ;;
--        4.*)                 check_optflags -fno-tree-vectorize ;;
--        *)    enabled x86 || check_optflags -fno-tree-vectorize ;;
--    esac
-+    check_optflags -fno-tree-vectorize
-     check_cflags -Werror=format-security
-     check_cflags -Werror=implicit-function-declaration
-     check_cflags -Werror=missing-prototypes
--- 
-2.8.1
-
diff --git a/debian/patches/fix-vaapi-default-values.patch b/debian/patches/fix-vaapi-default-values.patch
deleted file mode 100644
index a664f29..0000000
--- a/debian/patches/fix-vaapi-default-values.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Use local independentant default values
-Author: Carl Eugen Hoyos
-
-diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
-index 979cf37..5bed4e4 100644
---- a/libavcodec/vaapi_encode_h264.c
-+++ b/libavcodec/vaapi_encode_h264.c
-@@ -1323,10 +1323,10 @@ static const AVCodecDefault vaapi_encode_h264_defaults[] = {
-     { "b",              "0"   },
-     { "bf",             "2"   },
-     { "g",              "120" },
--    { "i_qfactor",      "1.0" },
--    { "i_qoffset",      "0.0" },
--    { "b_qfactor",      "1.2" },
--    { "b_qoffset",      "0.0" },
-+    { "i_qfactor",      "1"   },
-+    { "i_qoffset",      "0"   },
-+    { "b_qfactor",      "6/5" },
-+    { "b_qoffset",      "0"   },
-     { NULL },
- };
- 
-diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
-index 1ef968c..45f6f6d 100644
---- a/libavcodec/vaapi_encode_h265.c
-+++ b/libavcodec/vaapi_encode_h265.c
-@@ -1341,10 +1341,10 @@ static const AVCodecDefault vaapi_encode_h265_defaults[] = {
-     { "b",              "0"   },
-     { "bf",             "2"   },
-     { "g",              "120" },
--    { "i_qfactor",      "1.0" },
--    { "i_qoffset",      "0.0" },
--    { "b_qfactor",      "1.2" },
--    { "b_qoffset",      "0.0" },
-+    { "i_qfactor",      "1"   },
-+    { "i_qoffset",      "0"   },
-+    { "b_qfactor",      "6/5" },
-+    { "b_qoffset",      "0"   },
-     { NULL },
- };
- 
diff --git a/debian/patches/series b/debian/patches/series
index c985bf7..0fa6ea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 disable-opj-static.patch
-Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch
-fix-vaapi-default-values.patch

-- 
ffmpeg packaging