summaryrefslogtreecommitdiffstats
path: root/multimedia/obs-studio/patches/3_ed1e079.patch
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/obs-studio/patches/3_ed1e079.patch')
-rw-r--r--multimedia/obs-studio/patches/3_ed1e079.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/multimedia/obs-studio/patches/3_ed1e079.patch b/multimedia/obs-studio/patches/3_ed1e079.patch
new file mode 100644
index 0000000000..d1e435ca9d
--- /dev/null
+++ b/multimedia/obs-studio/patches/3_ed1e079.patch
@@ -0,0 +1,39 @@
+From ed1e0795acde8349ab18b631c545f56e5a3acb9d Mon Sep 17 00:00:00 2001
+From: Stephen Seo <seo.disparate@gmail.com>
+Date: Wed, 29 Nov 2023 20:07:10 +0900
+Subject: [PATCH] libobs: Fence off unnecessary code due to FFmpeg v6.1 changes
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+This commit prevents obs from using the "fenced" code if using FFmpeg
+6.1, since in FFmpeg commit [1] the "side_data" is added to
+`AVCodecParameters`, and therefore the existing/following
+`avcodec_parameters_copy(...)` will account for the metadata.
+
+[1]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ libobs/media-io/media-remux.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c
+index 7d5eead200012..827d4e59b18ed 100644
+--- a/libobs/media-io/media-remux.c
++++ b/libobs/media-io/media-remux.c
+@@ -91,6 +91,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ #if FF_API_BUFFER_SIZE_T
+ int content_size;
+ #else
+@@ -125,6 +126,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ mastering_size);
+ }
+ }
++#endif
+
+ ret = avcodec_parameters_copy(out_stream->codecpar,
+ in_stream->codecpar);