aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2017-08-21 22:36:51 +0800
committermat <mat@FreeBSD.org>2017-08-21 22:36:51 +0800
commit1fd605b83eff8a85371faab88a08753f6e020aa1 (patch)
treeae593138898509bc1735e59ffc59d365aa1d0551 /multimedia
parent7d2b5d7bd84e3b609d50732e1251a49dfc9eadcb (diff)
downloadfreebsd-ports-gnome-1fd605b83eff8a85371faab88a08753f6e020aa1.tar.gz
freebsd-ports-gnome-1fd605b83eff8a85371faab88a08753f6e020aa1.tar.zst
freebsd-ports-gnome-1fd605b83eff8a85371faab88a08753f6e020aa1.zip
Grmbl, commit the actual good version of the patch.
Sponsored by: Absolight
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c
index 36d080009c7b..61c2bc5cfb13 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c
+++ b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c
@@ -1,14 +1,16 @@
--- libavcodec/libopenjpegenc.c.orig 2017-07-29 17:49:30 UTC
+++ libavcodec/libopenjpegenc.c
-@@ -32,6 +32,8 @@
+@@ -32,7 +32,9 @@
#include "avcodec.h"
#include "internal.h"
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
+# include <openjpeg-2.2/openjpeg.h>
- #if HAVE_OPENJPEG_2_1_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>
@@ -42,7 +44,7 @@
# include <openjpeg.h>
#endif