virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavfi: deprecate avfilter_config_links()

Browse Source 
It never makes sense for this function to be called by users.
This commit is contained in:
Anton Khirnov 2024-03-04 16:23:31 +01:00
parent 6b1f41e152
commit abd7da0af9
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avfilter.c
View File

@ -212,6 +212,10 @@ void avfilter_link_free(AVFilterLink **link)
{ {
link_free(link); link_free(link);
} }
int avfilter_config_links(AVFilterContext *filter)
{
return ff_filter_config_links(EINVAL);
}
#endif #endif
static void update_link_current_pts(FilterLinkInternal *li, int64_t pts) 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; return 0;
} }
int avfilter_config_links(AVFilterContext *filter) int ff_filter_config_links(AVFilterContext *filter)
{ {
int (*config_link)(AVFilterLink *); int (*config_link)(AVFilterLink *);
unsigned i; unsigned i;
@ -353,7 +357,7 @@ int avfilter_config_links(AVFilterContext *filter)
case AVLINK_UNINIT: case AVLINK_UNINIT:
li->init_state = AVLINK_STARTINIT; li->init_state = AVLINK_STARTINIT;
if ((ret = avfilter_config_links(link->src)) < 0) if ((ret = ff_filter_config_links(link->src)) < 0)
return ret; return ret;
if (!(config_link = link->srcpad->config_props)) { if (!(config_link = link->srcpad->config_props)) {

8
libavfilter/avfilter.h
View File

@ -682,15 +682,13 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
*/ */
attribute_deprecated attribute_deprecated
void avfilter_link_free(AVFilterLink **link); void avfilter_link_free(AVFilterLink **link);
#endif
/** /**
* Negotiate the media format, dimensions, etc of all inputs to a filter. * @deprecated this function should never be called by users
*
* @param filter the filter to negotiate the properties for its inputs
* @return zero on successful negotiation
*/ */
attribute_deprecated
int avfilter_config_links(AVFilterContext *filter); 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_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) #define AVFILTER_CMD_FLAG_FAST 2 ///< Only execute command when its fast (like a video out that supports contrast adjustment in hw)

2
libavfilter/avfiltergraph.c
View File

@ -251,7 +251,7 @@ static int graph_config_links(AVFilterGraph *graph, void *log_ctx)
filt = graph->filters[i]; filt = graph->filters[i];
if (!filt->nb_outputs) { if (!filt->nb_outputs) {
if ((ret = avfilter_config_links(filt))) if ((ret = ff_filter_config_links(filt)))
return ret; return ret;
} }
} }

2
libavfilter/f_streamselect.c
View File

@ -245,7 +245,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
if (ret < 0) if (ret < 0)
return ret; return ret;
return avfilter_config_links(ctx); return ff_filter_config_links(ctx);
} }
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }

8
libavfilter/internal.h
View File

@ -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); 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 D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))