av_opt_get_int(aresample->swr, "ocl", 0, &out_layout);
in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
- if ((ret = ff_formats_ref(in_formats, &inlink->out_formats)) < 0)
+ if ((ret = ff_formats_ref(in_formats, &inlink->outcfg.formats)) < 0)
return ret;
in_samplerates = ff_all_samplerates();
- if ((ret = ff_formats_ref(in_samplerates, &inlink->out_samplerates)) < 0)
+ if ((ret = ff_formats_ref(in_samplerates, &inlink->outcfg.samplerates)) < 0)
return ret;
in_layouts = ff_all_channel_counts();
- if ((ret = ff_channel_layouts_ref(in_layouts, &inlink->out_channel_layouts)) < 0)
+ if ((ret = ff_channel_layouts_ref(in_layouts, &inlink->outcfg.channel_layouts)) < 0)
return ret;
if(out_rate > 0) {
out_samplerates = ff_all_samplerates();
}
- if ((ret = ff_formats_ref(out_samplerates, &outlink->in_samplerates)) < 0)
+ if ((ret = ff_formats_ref(out_samplerates, &outlink->incfg.samplerates)) < 0)
return ret;
if(out_format != AV_SAMPLE_FMT_NONE) {
out_formats = ff_make_format_list(formatlist);
} else
out_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
- if ((ret = ff_formats_ref(out_formats, &outlink->in_formats)) < 0)
+ if ((ret = ff_formats_ref(out_formats, &outlink->incfg.formats)) < 0)
return ret;
if(out_layout) {
int64_t layout_list[] = { out_layout, -1 };
- out_layouts = avfilter_make_format64_list(layout_list);
+ out_layouts = ff_make_format64_list(layout_list);
} else
out_layouts = ff_all_channel_counts();
- return ff_channel_layouts_ref(out_layouts, &outlink->in_channel_layouts);
+ return ff_channel_layouts_ref(out_layouts, &outlink->incfg.channel_layouts);
}
return ret;
}
-static const AVClass *resample_child_class_next(const AVClass *prev)
+static const AVClass *resample_child_class_iterate(void **iter)
{
- return prev ? NULL : swr_get_class();
+ const AVClass *c = *iter ? NULL : swr_get_class();
+ *iter = (void*)(uintptr_t)c;
+ return c;
}
static void *resample_child_next(void *obj, void *prev)
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
- .child_class_next = resample_child_class_next,
+ .child_class_iterate = resample_child_class_iterate,
.child_next = resample_child_next,
};
{ NULL }
};
-AVFilter ff_af_aresample = {
+const AVFilter ff_af_aresample = {
.name = "aresample",
.description = NULL_IF_CONFIG_SMALL("Resample audio data."),
.init_dict = init_dict,