🚑️ Fix build on FFMPEG 6

3 files changed, 35 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdbdbf7dd5c8..b812baf0c614 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = obs-streamfx-git
 	pkgdesc = Bring your stream back to life with modern effects!
-	pkgver = 0.12.0a170.r1.g7234ae97
+	pkgver = 0.12.0b191.r10.g5dfb8bca
 	pkgrel = 1
 	url = https://github.com/Xaymar/obs-StreamFX
 	arch = x86_64
@@ -28,6 +28,8 @@ pkgbase = obs-streamfx-git
 	provides = obs-streamfx
 	conflicts = obs-streamfx
 	source = obs-streamfx-git::git+https://github.com/Xaymar/obs-StreamFX.git#branch=root
+	source = 00001-fix-build-on-ffmpeg-6.patch
 	md5sums = SKIP
+	md5sums = e532ab3c20aa2b40099706990ec92ba0
 
 pkgname = obs-streamfx-git
diff --git a/00001-fix-build-on-ffmpeg-6.patch b/00001-fix-build-on-ffmpeg-6.patch
new file mode 100644
index 000000000000..5bae53bbef53
--- /dev/null
+++ b/00001-fix-build-on-ffmpeg-6.patch
@@ -0,0 +1,26 @@
+diff --git a/source/encoders/encoder-ffmpeg.cpp b/source/encoders/encoder-ffmpeg.cpp
+index 1bfbc32c..43b05c48 100644
+--- a/source/encoders/encoder-ffmpeg.cpp
++++ b/source/encoders/encoder-ffmpeg.cpp
+@@ -1045,7 +1045,7 @@ void ffmpeg_factory::get_defaults2(obs_data_t* settings)
+ 	if (_handler)
+ 		_handler->get_defaults(settings, _avcodec, nullptr, _handler->is_hardware_encoder(this));
+ 
+-	if ((_avcodec->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0) {
++	if ((avcodec_descriptor_get(_avcodec->id)->props & AV_CODEC_PROP_INTRA_ONLY) == 0) {
+ 		obs_data_set_default_int(settings, ST_KEY_KEYFRAMES_INTERVALTYPE, 0);
+ 		obs_data_set_default_double(settings, ST_KEY_KEYFRAMES_INTERVAL_SECONDS, 2.0);
+ 		obs_data_set_default_int(settings, ST_KEY_KEYFRAMES_INTERVAL_FRAMES, 300);
+diff --git a/source/encoders/handlers/handler.cpp b/source/encoders/handlers/handler.cpp
+index bb109dac..58199952 100644
+--- a/source/encoders/handlers/handler.cpp
++++ b/source/encoders/handlers/handler.cpp
+@@ -9,7 +9,7 @@ using namespace streamfx::encoder::ffmpeg;
+ 
+ bool handler::handler::has_keyframe_support(ffmpeg_factory* instance)
+ {
+-	return (instance->get_avcodec()->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0;
++	return (avcodec_descriptor_get(instance->get_avcodec()->id)->props & AV_CODEC_PROP_INTRA_ONLY) == 0;
+ }
+ 
+ bool handler::handler::is_hardware_encoder(ffmpeg_factory* instance)
diff --git a/PKGBUILD b/PKGBUILD
index d3cfb0b9e455..e5aa42d72baf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Hugo Denizart <hugo at denizart dot pro>
 pkgname=obs-streamfx-git
-pkgver=0.12.0a170.r1.g7234ae97
+pkgver=0.12.0b191.r10.g5dfb8bca
 pkgrel=1
 pkgdesc="Bring your stream back to life with modern effects!"
 arch=("x86_64")
@@ -14,8 +14,10 @@ makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack"
              "vlc" "swig" "luajit" "python" "ninja")
 provides=("obs-streamfx")
 conflicts=("obs-streamfx")
-source=("$pkgname::git+https://github.com/Xaymar/obs-StreamFX.git#branch=root")
-md5sums=("SKIP")
+source=("$pkgname::git+https://github.com/Xaymar/obs-StreamFX.git#branch=root"
+        "00001-fix-build-on-ffmpeg-6.patch")
+md5sums=("SKIP"
+         "e532ab3c20aa2b40099706990ec92ba0")
 
 pkgver() {
   cd "$pkgname"
@@ -25,6 +27,7 @@ pkgver() {
 prepare() {
   cd $pkgname
   git submodule update --init --recursive
+  git apply ../00001-fix-build-on-ffmpeg-6.patch
 }
 
 build() {