[PATCH 0/1] MR6660: winedmo: Check and guard libavcodec/bsf.h inclusion.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57269

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6660

[PATCH 1/1] winedmo: Check and guard libavcodec/bsf.h inclusion.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57269
---
 configure.ac                | 2 +-
 dlls/winedmo/unix_private.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 900b90caa59..f0c7449bdd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1623,7 +1623,7 @@ dnl **** Check for FFmpeg ****
 if test "x$with_ffmpeg" != "xno";
 then
     WINE_PACKAGE_FLAGS(FFMPEG,[libavutil libavformat libavcodec],,,,
-        [AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec.h])
+        [AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec.h libavcodec/bsf.h])
          if test "$ac_cv_header_libavutil_avutil_h" = "yes" -a "$ac_cv_header_libavformat_avformat_h" = "yes" -a "$ac_cv_header_libavcodec_avcodec_h" = "yes"
          then
             AC_CHECK_LIB(avutil,av_log_set_callback,
diff --git a/dlls/winedmo/unix_private.h b/dlls/winedmo/unix_private.h
index 9950077cb33..8192926bfc4 100644
--- a/dlls/winedmo/unix_private.h
+++ b/dlls/winedmo/unix_private.h
@@ -27,7 +27,9 @@
 #include <libavutil/imgutils.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
-#include <libavcodec/bsf.h>
+#ifdef HAVE_LIBAVCODEC_BSF_H
+# include <libavcodec/bsf.h>
+#endif
 #else
 typedef struct AVCodecParameters AVCodecParameters;
 typedef struct AVRational AVRational;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6660