[SCM] ffmpeg/master: Drop patches, fixed differently upstream

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

The following commit has been merged in the master branch:
commit 1982ac3e5fef9ec4e4ef20126af6c27ba0e6e053
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 22 20:35:21 2016 +0200

    Drop patches, fixed differently upstream

diff --git a/debian/patches/disable-opj-static.patch b/debian/patches/disable-opj-static.patch
deleted file mode 100644
index 1f369bf..0000000
--- a/debian/patches/disable-opj-static.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Do not define OPJ_STATIC
- Setting OPJ_STATIC when using openjpeg 2.1.1 causes the symbols to have
- visibility hidden and the final linker step to fail.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2016-07-12
-
---- ffmpeg-3.1.1.orig/configure
-+++ ffmpeg-3.1.1/configure
-@@ -5669,7 +5669,7 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
-+enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
-                                check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
-                                check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
---- ffmpeg-3.1.1.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.1.1/libavcodec/libopenjpegdec.c
-@@ -37,6 +37,7 @@
- #include "thread.h"
- 
- #if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#  undef OPJ_STATIC
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
---- ffmpeg-3.1.1.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.1.1/libavcodec/libopenjpegenc.c
-@@ -35,6 +35,7 @@
- #include "internal.h"
- 
- #if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#  undef OPJ_STATIC
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
diff --git a/debian/patches/libopenjpegenc-recreate-image-data-buffer.patch b/debian/patches/libopenjpegenc-recreate-image-data-buffer.patch
deleted file mode 100644
index 2c9407f..0000000
--- a/debian/patches/libopenjpegenc-recreate-image-data-buffer.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From eaf463d45aff5836a21715b82922112b4c3faf86 Mon Sep 17 00:00:00 2001
-From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Date: Tue, 11 Oct 2016 18:46:28 +0200
-Subject: [PATCH] libopenjpegenc: recreate image data buffer after encoding
- frame
-
-openjpeg 2 sets the data pointers of the image components to NULL,
-causing segfaults if the image is reused.
-
-Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
----
- libavcodec/libopenjpegenc.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
-index 023fdf4..2f0ab20 100644
---- a/libavcodec/libopenjpegenc.c
-+++ b/libavcodec/libopenjpegenc.c
-@@ -776,6 +776,16 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-         goto done;
-     }
- 
-+    // openjpeg 2 sets the data pointers of the image components to NULL.
-+    // Thus the image can't be reused.
-+    opj_image_destroy(ctx->image);
-+    ctx->image = mj2_create_image(avctx, &ctx->enc_params);
-+    if (!ctx->image) {
-+        av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n");
-+        ret = AVERROR(EINVAL);
-+        goto done;
-+    }
-+
-     av_shrink_packet(pkt, writer.pos);
- #endif // OPENJPEG_MAJOR_VERSION == 1
- 
--- 
-2.9.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 9acc30e..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-disable-opj-static.patch
-libopenjpegenc-recreate-image-data-buffer.patch

-- 
ffmpeg packaging