From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B275342235 for ; Tue, 1 Mar 2022 08:16:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8F0B68B20D; Tue, 1 Mar 2022 10:16:27 +0200 (EET) Received: from mail1.trendhosting.net (mail1.trendhosting.net [195.8.117.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B055968B1CA for ; Tue, 1 Mar 2022 10:16:21 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by mail1.trendhosting.net (Postfix) with ESMTP id 9C29D150DC for ; Tue, 1 Mar 2022 08:16:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pocock.pro; s=mail; t=1646122580; bh=KjAT5u8nYoYe893vqRKEI59qPegC3Uxo6u+Mt+tPeHY=; h=To:From:Subject:Date:From; b=miWdoUvQx+EH0ksxI8FNlUsMN5TyimLAU7zS35pK+vTsOFJuKxrqCrZb+aZpofQaF SL/cFdmsG07g7mCXXeUl/OOCAgM92z29diae8PXu/jJO+ofsv+QFTERUI9rvOeuhkN wBtiUTnyeCKjqPYzOTtL72jMuT6LivTiadild5c4= Received: from mail1.trendhosting.net ([127.0.0.1]) by localhost (thp003.trendhosting.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e7Nsiv-doC4T for ; Tue, 1 Mar 2022 08:16:17 +0000 (GMT) Received: from [IPv6:2001:1620:e61:0:ec02:598c:9d65:511b] (unknown [IPv6:2001:1620:e61:0:ec02:598c:9d65:511b]) by mail1.trendhosting.net (Postfix) with ESMTPSA id AA568150D2 for ; Tue, 1 Mar 2022 08:16:17 +0000 (GMT) To: ffmpeg-devel@ffmpeg.org From: Daniel Pocock Message-ID: <752868c0-25e3-8801-67fa-0a4ec1adb0c4@pocock.pro> Date: Tue, 1 Mar 2022 09:16:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux ppc64le; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------C9A5CDA7C089AC588AFC1362" Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] fix build, avcodec: update OpenH264 header path X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------C9A5CDA7C089AC588AFC1362 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit This updates the locations searched for the OpenH264 headers to be consistent with upstream Discussed here: https://github.com/cisco/openh264/pull/3415 Due to the change in the pkgconfig file, it is possible to compile with either: #include OR #include but in this patch, I used the former. Regards, Daniel -- Debian Developer https://danielpocock.com --------------C9A5CDA7C089AC588AFC1362 Content-Type: text/x-patch; charset=UTF-8; name="0001-avcodec-update-OpenH264-header-path.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-avcodec-update-OpenH264-header-path.patch" >From 6736ae3d20db9cb79b328c6e3e9080c42c6216d4 Mon Sep 17 00:00:00 2001 From: Daniel Pocock Date: Tue, 1 Mar 2022 09:09:00 +0100 Subject: [PATCH] avcodec: update OpenH264 header path --- configure | 2 +- libavcodec/libopenh264.c | 4 ++-- libavcodec/libopenh264dec.c | 4 ++-- libavcodec/libopenh264enc.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8c69ab0c86..a08d86049c 100755 --- a/configure +++ b/configure @@ -6562,7 +6562,7 @@ enabled libopencv && { check_headers opencv2/core/core_c.h && { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } -enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion +enabled libopenh264 && require_pkg_config libopenh264 openh264 openh264/codec_api.h WelsGetCodecVersion enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version || { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++" diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c index 0f6d28ed88..a230e2ae5f 100644 --- a/libavcodec/libopenh264.c +++ b/libavcodec/libopenh264.c @@ -20,8 +20,8 @@ */ #include -#include -#include +#include +#include #include "libavutil/error.h" #include "libavutil/log.h" diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index 7f5e85402a..9d1210ca3e 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include +#include #include "libavutil/common.h" #include "libavutil/fifo.h" diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 7c0501a2eb..605c0c0532 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include +#include #include "libavutil/attributes.h" #include "libavutil/common.h" -- 2.30.2 --------------C9A5CDA7C089AC588AFC1362 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --------------C9A5CDA7C089AC588AFC1362--