cingg + my ffmpeg5 patches compiles with ffmpeg.git, but all our patches
fail to apply... need some rethinking/rebasing
loading vp9 media + seeking + i/o points rendering into mp4 works,
resulting file loads..
but I guess there will be other (breaking) changes on road to 5.1...
---------- Forwarded message ----------
From: *Андрей Рандрианасулу* <[email protected]>
Date: Tuesday, April 5, 2022
Subject: ffmpeg.git unconditional fixes
To: randrianasulu <[email protected]>
using git up to
commit e5189b13827746e57bc1eccc78a5381f646963b9 (grafted, HEAD -> master,
origin/master, origin/HEAD)
Author: Paul B Mahol <[email protected]>
Date: Mon Mar 28 12:39:05 2022 +0200
avfilter/vf_zscale: fix regression with src/dst_format initialization
--
Андрей Рандрианасулу
diff --git a/cinelerra-5.1/cinelerra/fileac3.h b/cinelerra-5.1/cinelerra/fileac3.h
index 8ae62c76..0e683e9a 100644
--- a/cinelerra-5.1/cinelerra/fileac3.h
+++ b/cinelerra-5.1/cinelerra/fileac3.h
@@ -60,7 +60,7 @@ public:
private:
AVPacket avpkt;
- AVCodec *codec;
+ const AVCodec *codec;
AVCodecContext *codec_context;
SwrContext *resample_context;
diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index f4d9ba3a..36a40d15 100644
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -913,14 +913,14 @@ int PluginFAClient::get_inchannels()
{
AVFilterContext *fctx = ffilt->fctx;
AVFilterLink **links = !fctx->nb_inputs ? 0 : fctx->inputs;
- return !links ? 0 : links[0]->channels;
+ return !links ? 0 : links[0]->ch_layout.nb_channels;
}
int PluginFAClient::get_outchannels()
{
AVFilterContext *fctx = ffilt->fctx;
AVFilterLink **links = !fctx->nb_outputs ? 0 : fctx->outputs;
- return !links ? 0 : links[0]->channels;
+ return !links ? 0 : links[0]->ch_layout.nb_channels;
}
int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start_position, int sample_rate)
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
