Showing the changes to libavfilter/avfiltergraph.c (1 of 34 files). Show all
Unified · Split
| @@ -189,7 +189,7 @@ static int filter_query_formats(AVFilterContext *ctx) · 188 unmodified lines | ||
| 189 | 189 | formats = avfilter_make_all_formats(type); |
| 190 | 190 | if (!formats) |
| 191 | 191 | return AVERROR(ENOMEM); |
| 192 | − avfilter_set_common_formats(ctx, formats); | |
| 192 | + ff_set_common_formats(ctx, formats); | |
| 193 | 193 | if (type == AVMEDIA_TYPE_AUDIO) { |
| 194 | 194 | samplerates = ff_all_samplerates(); |
| 195 | 195 | if (!samplerates) |
| @@ -231,9 +231,9 @@ static int insert_conv_filter(AVFilterGraph *graph, AVFilterLink *link, · 35 unmodified lines | ||
| 231 | 231 | filter_query_formats(filt_ctx); |
| 232 | 232 | |
| 233 | 233 | if ( ((link = filt_ctx-> inputs[0]) && |
| 234 | − !avfilter_merge_formats(link->in_formats, link->out_formats)) || | |
| 234 | + !ff_merge_formats(link->in_formats, link->out_formats)) || | |
| 235 | 235 | ((link = filt_ctx->outputs[0]) && |
| 236 | − !avfilter_merge_formats(link->in_formats, link->out_formats)) | |
| 236 | + !ff_merge_formats(link->in_formats, link->out_formats)) | |
| 237 | 237 | ) { |
| 238 | 238 | av_log(NULL, AV_LOG_ERROR, |
| 239 | 239 | "Impossible to convert between the formats supported by the filter " |
| @@ -295,7 +295,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 55 unmodified lines | ||
| 295 | 295 | return AVERROR(EINVAL); |
| 296 | 296 | |
| 297 | 297 | if (link->type == AVMEDIA_TYPE_VIDEO && |
| 298 | − !avfilter_merge_formats(link->in_formats, link->out_formats)) { | |
| 298 | + !ff_merge_formats(link->in_formats, link->out_formats)) { | |
| 299 | 299 | |
| 300 | 300 | /* couldn't merge format lists, auto-insert scale filter */ |
| 301 | 301 | snprintf(filt_args, sizeof(filt_args), "0:0:%s", |
| @@ -310,7 +310,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 8 unmodified lines | ||
| 310 | 310 | /* Merge all three list before checking: that way, in all |
| 311 | 311 | * three categories, aconvert will use a common format |
| 312 | 312 | * whenever possible. */ |
| 313 | − formats = avfilter_merge_formats(link->in_formats, link->out_formats); | |
| 313 | + formats = ff_merge_formats(link->in_formats, link->out_formats); | |
| 314 | 314 | chlayouts = ff_merge_channel_layouts(link->in_channel_layouts , link->out_channel_layouts); |
| 315 | 315 | samplerates = ff_merge_samplerates (link->in_samplerates, link->out_samplerates); |
| 316 | 316 | |