summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c')
-rw-r--r--multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c
deleted file mode 100644
index 0eec4b9778c7..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- libavcodec/libopenjpegdec.c.orig 2017-09-12 00:51:33 UTC
-+++ libavcodec/libopenjpegdec.c
-@@ -34,7 +34,11 @@
- #include "internal.h"
- #include "thread.h"
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+# include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
-+# include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- # include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +48,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCo
- opj_stream_set_read_function(stream, stream_read);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader);