Signed-off-by: Nicolas George <geo...@nsup.org>
---
libavfilter/formats.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Rebased on top of recent commits and resolved conflicts.
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 0a351d4174..695d28ea8e 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -535,15 +535,15 @@ void ff_formats_changeref(AVFilterFormats **oldref,
AVFilterFormats **newref)
FORMATS_CHANGEREF(oldref, newref);
}
-#define SET_COMMON_FORMATS(ctx, fmts, in_fmts, out_fmts, ref_fn, unref_fn) \
+#define SET_COMMON_FORMATS(ctx, fmts, ref_fn, unref_fn) \
int count = 0, i; \
\
if (!fmts) \
return AVERROR(ENOMEM); \
\
for (i = 0; i < ctx->nb_inputs; i++) { \
- if (ctx->inputs[i] && !ctx->inputs[i]->out_fmts) { \
- int ret = ref_fn(fmts, &ctx->inputs[i]->out_fmts); \
+ if (ctx->inputs[i] && !ctx->inputs[i]->outcfg.fmts) { \
+ int ret = ref_fn(fmts, &ctx->inputs[i]->outcfg.fmts); \
if (ret < 0) { \
return ret; \
} \
@@ -551,8 +551,8 @@ void ff_formats_changeref(AVFilterFormats **oldref,
AVFilterFormats **newref)
} \
} \
for (i = 0; i < ctx->nb_outputs; i++) { \
- if (ctx->outputs[i] && !ctx->outputs[i]->in_fmts) { \
- int ret = ref_fn(fmts, &ctx->outputs[i]->in_fmts); \
+ if (ctx->outputs[i] && !ctx->outputs[i]->incfg.fmts) { \
+ int ret = ref_fn(fmts, &ctx->outputs[i]->incfg.fmts); \
if (ret < 0) { \
return ret; \
} \
@@ -567,16 +567,16 @@ void ff_formats_changeref(AVFilterFormats **oldref,
AVFilterFormats **newref)
return 0;
int ff_set_common_channel_layouts(AVFilterContext *ctx,
- AVFilterChannelLayouts *layouts)
+ AVFilterChannelLayouts *channel_layouts)
{
- SET_COMMON_FORMATS(ctx, layouts, incfg.channel_layouts,
outcfg.channel_layouts,
+ SET_COMMON_FORMATS(ctx, channel_layouts,
ff_channel_layouts_ref, ff_channel_layouts_unref);
}
int ff_set_common_samplerates(AVFilterContext *ctx,
AVFilterFormats *samplerates)
{
- SET_COMMON_FORMATS(ctx, samplerates, incfg.samplerates, outcfg.samplerates,
+ SET_COMMON_FORMATS(ctx, samplerates,
ff_formats_ref, ff_formats_unref);
}
@@ -587,7 +587,7 @@ int ff_set_common_samplerates(AVFilterContext *ctx,
*/
int ff_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats)
{
- SET_COMMON_FORMATS(ctx, formats, incfg.formats, outcfg.formats,
+ SET_COMMON_FORMATS(ctx, formats,
ff_formats_ref, ff_formats_unref);
}
--
2.28.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
