From dff2eef58d18b80f04ffd09b1e3ef95ab7a4b26b Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Thu, 27 Oct 2016 23:43:13 +0100
Subject: [PATCH] drop patch, fixed upstream

---
 ffmpeg.spec       |  2 --
 ffmpeg_opj2.patch | 36 ------------------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 ffmpeg_opj2.patch

diff --git a/ffmpeg.spec b/ffmpeg.spec
index a9681ff..ea984a5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -32,7 +32,6 @@ Source0:        ffmpeg-%{?branch}%{date}.tar.bz2
 %else
 Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
 %endif
-Patch0:         %{name}_opj2.patch
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:  bzip2-devel
 %{?_with_faac:BuildRequires: faac-devel}
@@ -233,7 +232,6 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
 %else
 %setup -q -n ffmpeg-%{version}
 %endif
-%patch0 -p1 -b .opj2
 # fix -O3 -g in host_cflags
 sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure
 mkdir -p _doc/examples
diff --git a/ffmpeg_opj2.patch b/ffmpeg_opj2.patch
deleted file mode 100644
index 11e66b4..0000000
--- a/ffmpeg_opj2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
---- ffmpeg-3.1.1/configure	2016-06-27 01:54:28.000000000 +0200
-+++ ffmpeg-3.1.1-new/configure	2016-07-27 22:25:36.585141648 +0200
-@@ -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 ||
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c	2016-06-27 01:54:29.000000000 +0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c	2016-07-27 22:25:45.509327071 +0200
-@@ -24,8 +24,6 @@
-  * JPEG 2000 decoder using libopenjpeg
-  */
-
--#define  OPJ_STATIC
--
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"
- #include "libavutil/intreadwrite.h"
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c	2016-06-27 01:54:29.000000000 +0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c	2016-07-27 22:25:40.298218807 +0200
-@@ -24,8 +24,6 @@
-  * JPEG 2000 encoder using libopenjpeg
-  */
-
--#define  OPJ_STATIC
--
- #include "libavutil/avassert.h"
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"