пт, 2 июн. 2023 г., 10:58 Andrea paz <gamberucci.and...@gmail.com>:

> Unfortunately, now we start with errors that I don't understand. The
> compilation failed and I attach the cin.log and configure.log.
> Question: shouldn't we use ffmpeg-git?
>

It tend to be API-unstable .. :/

Anyway

pluginfclient.C:665:13: error: ‘avfilter_pad_count’ was not declared in
this scope
  665 |         if( avfilter_pad_count(fp->outputs) > 1 ) return 0;

hopefully fixed by my patch (attached)

Phyllis currently testing ffmpeg-6.0 with rebased patches.


in ffmpeg.git we hopefully will see vulkan h264/265 decoding and no
additional breakage!



> The configure I used is as follows:
>
> ./configure --with-single-user --disable-static-build
> --with-config-dir=/home/paz/.bcast6 --without-thirdparty
> --without-libdpx
>
> Taking a hint from "bsd.sh" I also tried the following configure:
>
> $ ./configure --with-single-user --disable-static-build
> --with-config-dir=/home/paz/.bcast6 --without-thirdparty
> --without-libdpx --disable-dav1d --disable-libaom --disable libwebp
> --without-nv
>
> But I get the error:
>
> configure: error: unrecognized option: `--disable'
> Try `./configure --help' for more information
>
> If I change the "disable" to "without" I get:
>
> configure: error: unrecognized option: `--without'
> Try `./configure --help' for more information
>
From 33b366e2f2d5998c202029f4798fbc87aaca1927 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianas...@gmail.com>
Date: Wed, 1 Mar 2023 23:24:48 +0300
Subject: [PATCH 2/4] Add 4 non-working plugins in ffmpeg 6.0 to plugin.opts

---
 cinelerra-5.1/ffmpeg/plugin.opts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cinelerra-5.1/ffmpeg/plugin.opts b/cinelerra-5.1/ffmpeg/plugin.opts
index b567e78f..44446fe8 100644
--- a/cinelerra-5.1/ffmpeg/plugin.opts
+++ b/cinelerra-5.1/ffmpeg/plugin.opts
@@ -477,3 +477,8 @@ virtualbass
 #remap_opencl ###Input/output error
 #xfade_opencl ###Input_output error
 #openclsrc ###invalid argument
+; do not work in 6.0
+#corr ###Input/output error
+#ssim360 ###Input/output error
+#a3dscope ###Input/output error
+#showcwt ###Input/output error
\ No newline at end of file
-- 
2.39.2

From 43c1702579e1bf2c39be103b1d373b2dc1faee1d Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianas...@gmail.com>
Date: Wed, 1 Mar 2023 22:25:17 +0300
Subject: [PATCH 1/4] Fix build in pluginfclient.C with ffmpeg 6.0

---
 cinelerra-5.1/cinelerra/pluginfclient.C | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index d188eb39..afb88c7a 100644
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -37,6 +37,8 @@
 #include "vframe.h"
 #include "filexml.h"
 
+#include "libavfilter/version.h"
+
 #ifdef FFMPEG3
 #define av_filter_iterate(p) ((*(const AVFilter**)(p))=avfilter_next(*(const AVFilter **)(p)))
 #endif
@@ -660,13 +662,22 @@ PluginFClient::~PluginFClient()
 }
 
 bool PluginFClient::is_audio(const AVFilter *fp)
+
 {
 	if( !fp->outputs ) return 0;
+#if LIBAVFILTER_VERSION_MINOR > 2
+	if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
+#else
 	if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
+#endif
 	if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
 	if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
 	if( !fp->inputs ) return 1;
+#if LIBAVFILTER_VERSION_MINOR > 2
+	if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
+#else
 	if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
+#endif
 	if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
 	if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
 	return 1;
@@ -674,11 +685,19 @@ bool PluginFClient::is_audio(const AVFilter *fp)
 bool PluginFClient::is_video(const AVFilter *fp)
 {
 	if( !fp->outputs ) return 0;
+#if LIBAVFILTER_VERSION_MINOR > 2
+	if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
+#else
 	if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
+#endif
 	if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
 	if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
 	if( !fp->inputs ) return 1;
+#if LIBAVFILTER_VERSION_MINOR > 2
+	if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
+#else
 	if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
+#endif
 	if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
 	if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
 	return 1;
-- 
2.39.2

-- 
Cin mailing list
Cin@lists.cinelerra-gg.org
https://lists.cinelerra-gg.org/mailman/listinfo/cin

Reply via email to