diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 8a5f4282ad..596a1394fd 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -212,6 +212,10 @@ void avfilter_link_free(AVFilterLink **link) { link_free(link); } +int avfilter_config_links(AVFilterContext *filter) +{ + return ff_filter_config_links(EINVAL); +} #endif static void update_link_current_pts(FilterLinkInternal *li, int64_t pts) @@ -322,7 +326,7 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, return 0; } -int avfilter_config_links(AVFilterContext *filter) +int ff_filter_config_links(AVFilterContext *filter) { int (*config_link)(AVFilterLink *); unsigned i; @@ -353,7 +357,7 @@ int avfilter_config_links(AVFilterContext *filter) case AVLINK_UNINIT: li->init_state = AVLINK_STARTINIT; - if ((ret = avfilter_config_links(link->src)) < 0) + if ((ret = ff_filter_config_links(link->src)) < 0) return ret; if (!(config_link = link->srcpad->config_props)) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 623c104885..a34e61f23c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -682,15 +682,13 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ attribute_deprecated void avfilter_link_free(AVFilterLink **link); -#endif /** - * Negotiate the media format, dimensions, etc of all inputs to a filter. - * - * @param filter the filter to negotiate the properties for its inputs - * @return zero on successful negotiation + * @deprecated this function should never be called by users */ +attribute_deprecated int avfilter_config_links(AVFilterContext *filter); +#endif #define AVFILTER_CMD_FLAG_ONE 1 ///< Stop once a filter understood the command (for target=all for example), fast filters are favored automatically #define AVFILTER_CMD_FLAG_FAST 2 ///< Only execute command when its fast (like a video out that supports contrast adjustment in hw) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 1fb2fe2516..bb5399c55e 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -251,7 +251,7 @@ static int graph_config_links(AVFilterGraph *graph, void *log_ctx) filt = graph->filters[i]; if (!filt->nb_outputs) { - if ((ret = avfilter_config_links(filt))) + if ((ret = ff_filter_config_links(filt))) return ret; } } diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index c64b33a563..5fbb13a323 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -245,7 +245,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar if (ret < 0) return ret; - return avfilter_config_links(ctx); + return ff_filter_config_links(ctx); } return AVERROR(ENOSYS); } diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 0e3f68d1f4..000f94cb16 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -246,6 +246,14 @@ int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, */ void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts); +/** + * Negotiate the media format, dimensions, etc of all inputs to a filter. + * + * @param filter the filter to negotiate the properties for its inputs + * @return zero on successful negotiation + */ +int ff_filter_config_links(AVFilterContext *filter); + #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))