[SCM] ffmpeg/master: Drop patches applied upstream

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6bd357d6b132b0747160c2a0bc5139761ba12fe0
Author: James Cowgill <jcowgill at debian.org>
Date:   Mon Dec 11 17:11:57 2017 +0000

    Drop patches applied upstream

diff --git a/debian/patches/0002-arm-Check-for-have_vfp_vm-instead-of-have_vfpv3.patch b/debian/patches/0002-arm-Check-for-have_vfp_vm-instead-of-have_vfpv3.patch
deleted file mode 100644
index 4a681b1..0000000
--- a/debian/patches/0002-arm-Check-for-have_vfp_vm-instead-of-have_vfpv3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for
- float_dsp_vfp
- .
- This patch disables arm VFP optimizations on processors which do not support
- the deprecated VFP vector extensions. In turn, this fixes the checkasm test
- when run on these processors.
-Origin: upstream, https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f1fd12ef858cf7efe843aa3063894a11b2d1e7d5
-Bug: https://trac.ffmpeg.org/ticket/6766
-Bug-Debian: https://bugs.debian.org/879800
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libavutil/arm/float_dsp_init_vfp.c
-+++ b/libavutil/arm/float_dsp_init_vfp.c
-@@ -36,11 +36,11 @@ void ff_butterflies_float_vfp(float *av_
- 
- av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags)
- {
--    if (!have_vfpv3(cpu_flags)) {
-+    if (have_vfp_vm(cpu_flags)) {
-         fdsp->vector_fmul = ff_vector_fmul_vfp;
-         fdsp->vector_fmul_window = ff_vector_fmul_window_vfp;
-     }
-     fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
--    if (!have_vfpv3(cpu_flags))
-+    if (have_vfp_vm(cpu_flags))
-         fdsp->butterflies_float = ff_butterflies_float_vfp;
- }
diff --git a/debian/patches/0003-lavc-reset-codec-on-receiving-packet-after-EOF-in-co.patch b/debian/patches/0003-lavc-reset-codec-on-receiving-packet-after-EOF-in-co.patch
deleted file mode 100644
index 0ea4452..0000000
--- a/debian/patches/0003-lavc-reset-codec-on-receiving-packet-after-EOF-in-co.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3b888315248e53021995e6db46096616eb36a597 Mon Sep 17 00:00:00 2001
-From: James Cowgill <jcowgill at debian.org>
-Date: Thu, 9 Nov 2017 09:07:50 +0000
-Subject: [PATCH] lavc: reset codec on receiving packet after EOF in
- compat_decode
-
-In commit 061a0c14bb57 ("decode: restructure the core decoding code"), the
-deprecated avcodec_decode_* APIs were reworked so that they called into the
-new avcodec_send_packet / avcodec_receive_frame API. This had the side effect
-of prohibiting sending new packets containing data after a drain
-packet, but in previous versions of FFmpeg this "worked" and some
-applications relied on it.
-
-To restore some compatibility, reset the codec if we receive a new non-drain
-packet using the old API after draining has completed. While this does
-not give the same behaviour as the old API did, in the majority of cases
-it works and it does not require changes to any other part of the decoding
-code.
-
-Fixes ticket #6775
-Signed-off-by: James Cowgill <jcowgill at debian.org>
----
- libavcodec/decode.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/decode.c b/libavcodec/decode.c
-index 86fe5aef52..2f1932fa85 100644
---- a/libavcodec/decode.c
-+++ b/libavcodec/decode.c
-@@ -726,6 +726,11 @@ static int compat_decode(AVCodecContext *avctx, AVFrame *frame,
- 
-     av_assert0(avci->compat_decode_consumed == 0);
- 
-+    if (avci->draining_done && pkt && pkt->size != 0) {
-+        av_log(avctx, AV_LOG_WARNING, "Got unexpected packet after EOF\n");
-+        avcodec_flush_buffers(avctx);
-+    }
-+
-     *got_frame = 0;
-     avci->compat_decode = 1;
- 
--- 
-2.15.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 7b10f1c..d75efb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-arm-thumb2-blx.patch
-0002-arm-Check-for-have_vfp_vm-instead-of-have_vfpv3.patch
-0003-lavc-reset-codec-on-receiving-packet-after-EOF-in-co.patch
 0004-avformat-dashenc-fix-min_seg_duration-option-size.patch
 0005-float-dsp-i386.patch

-- 
ffmpeg packaging