[FFmpeg-devel] [PATCH] fix build, avcodec: update OpenH264 header path

[Daniel Pocock]

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 <openh264/codec_api.h>

OR

  #include <codec_api.h>

but in this patch, I used the former.

Regards,

Daniel

-- 
Debian Developer
https://danielpocock.com

>From 6736ae3d20db9cb79b328c6e3e9080c42c6216d4 Mon Sep 17 00:00:00 2001
From: Daniel Pocock <dan...@pocock.pro>
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 <string.h>
-#include <wels/codec_api.h>
-#include <wels/codec_ver.h>
+#include <openh264/codec_api.h>
+#include <openh264/codec_ver.h>
 
 #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 <wels/codec_api.h>
-#include <wels/codec_ver.h>
+#include <openh264/codec_api.h>
+#include <openh264/codec_ver.h>
 
 #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 <wels/codec_api.h>
-#include <wels/codec_ver.h>
+#include <openh264/codec_api.h>
+#include <openh264/codec_ver.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
-- 
2.30.2


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".