diff options
author | Mina Nagy Zaki <mnzaki@gmail.com> | 2011-08-04 15:47:00 +0300 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-06 12:13:18 +0200 |
commit | 5f68a91be242c05bdd5aeffd74b36a1e6c782dd5 (patch) | |
tree | c86a2387bee3a6553904d5cb1aaf6be803363e9c /libavfilter/defaults.c | |
parent | 4b7889453e50a7fdfe079ddc62eaca04c4d742ee (diff) |
lavfi: remove default config_props() callback and refactor avfilter_config_links()
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.
Also remove channel_layout check as it is now negotiated.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diffstat (limited to 'libavfilter/defaults.c')
-rw-r--r-- | libavfilter/defaults.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index eef9fd1278..aadecf2d02 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -174,29 +174,6 @@ void avfilter_default_filter_samples(AVFilterLink *inlink, AVFilterBufferRef *sa inlink->cur_buf = NULL; } -/** - * default config_link() implementation for output video links to simplify - * the implementation of one input one output video filters */ -int avfilter_default_config_output_link(AVFilterLink *link) -{ - if (link->src->input_count && link->src->inputs[0]) { - if (link->type == AVMEDIA_TYPE_VIDEO) { - link->w = link->src->inputs[0]->w; - link->h = link->src->inputs[0]->h; - link->time_base = link->src->inputs[0]->time_base; - } else if (link->type == AVMEDIA_TYPE_AUDIO) { - link->channel_layout = link->src->inputs[0]->channel_layout; - link->sample_rate = link->src->inputs[0]->sample_rate; - } - } else { - /* XXX: any non-simple filter which would cause this branch to be taken - * really should implement its own config_props() for this link. */ - return -1; - } - - return 0; -} - static void set_common_formats(AVFilterContext *ctx, AVFilterFormats *fmts, enum AVMediaType type, int offin, int offout) { |