Date: Mon, 21 Aug 2017 14:36:51 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448476 - head/multimedia/ffmpeg/files Message-ID: <201708211436.v7LEapP0050102@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Aug 21 14:36:51 2017 New Revision: 448476 URL: https://svnweb.freebsd.org/changeset/ports/448476 Log: Grmbl, commit the actual good version of the patch. Sponsored by: Absolight Modified: head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c (contents, props changed) Modified: head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c ============================================================================== --- head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c Mon Aug 21 14:19:11 2017 (r448475) +++ head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c Mon Aug 21 14:36:51 2017 (r448476) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708211436.v7LEapP0050102>