breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavfi: deprecate default config_props() callback and refactor avfilter_config_links()

Browse Source 
Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Remove now empty defaults.c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Mina Nagy Zaki
2011-08-04 15:47:00 +03:00
committed by Anton Khirnov
parent ccefa89f39
commit 88c3b87bd8
5 changed files with 39 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libavfilter/avfilter.c
View File

@@ -155,18 +155,38 @@ int avfilter_config_links(AVFilterContext *filter)
if ((ret = avfilter_config_links(link->src)) < 0)
return ret;
if (!(config_link = link->srcpad->config_props))
config_link = avfilter_default_config_output_link;
if ((ret = config_link(link)) < 0)
if (!(config_link = link->srcpad->config_props)) {
if (link->src->input_count != 1) {
av_log(link->src, AV_LOG_ERROR, "Source filters and filters "
"with more than one input "
"must set config_props() "
"callbacks on all outputs\n");
return AVERROR(EINVAL);
}
} else if ((ret = config_link(link)) < 0)
return ret;
if (link->time_base.num == 0 && link->time_base.den == 0)
link->time_base = link->src && link->src->input_count ?
link->src->inputs[0]->time_base : AV_TIME_BASE_Q;
if (link->sample_aspect_ratio.num == 0 && link->sample_aspect_ratio.den == 0)
link->sample_aspect_ratio = link->src->input_count ?
link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1};
if (link->type == AVMEDIA_TYPE_VIDEO) {
if (!link->sample_aspect_ratio.num && !link->sample_aspect_ratio.den)
link->sample_aspect_ratio = link->src->input_count ?
link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1};
if (link->src->input_count) {
if (!link->w)
link->w = link->src->inputs[0]->w;
if (!link->h)
link->h = link->src->inputs[0]->h;
} else if (!link->w || !link->h) {
av_log(link->src, AV_LOG_ERROR,
"Video source filters must set their output link's "
"width and height\n");
return AVERROR(EINVAL);
}
}
if ((config_link = link->dstpad->config_props))
if ((ret = config_link(link)) < 0)
@@ -400,3 +420,10 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
ret = filter->filter->init(filter, args, opaque);
return ret;
}
#if FF_API_DEFAULT_CONFIG_OUTPUT_LINK
int avfilter_default_config_output_link(AVFilterLink *link)
{
return 0;
}
#endif