Commit 7313132b authored by Stefano Sabatini's avatar Stefano Sabatini

Rename AVFilterInOut field filter to filter_ctx, more semantically correct.

Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c24f76b9
......@@ -388,12 +388,12 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost)
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
outputs->name = av_strdup("in");
outputs->filter = last_filter;
outputs->filter_ctx = last_filter;
outputs->pad_idx = 0;
outputs->next = NULL;
inputs->name = av_strdup("out");
inputs->filter = ist->output_video_filter;
inputs->filter_ctx = ist->output_video_filter;
inputs->pad_idx = 0;
inputs->next = NULL;
......
......@@ -1811,12 +1811,12 @@ static int video_thread(void *arg)
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
outputs->name = av_strdup("in");
outputs->filter = filt_src;
outputs->filter_ctx = filt_src;
outputs->pad_idx = 0;
outputs->next = NULL;
inputs->name = av_strdup("out");
inputs->filter = filt_out;
inputs->filter_ctx = filt_out;
inputs->pad_idx = 0;
inputs->next = NULL;
......
......@@ -207,13 +207,13 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
*curr_inputs = (*curr_inputs)->next;
if (p->filter) {
if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
if (p->filter_ctx) {
if ((ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
return ret;
av_free(p->name);
av_free(p);
} else {
p->filter = filt_ctx;
p->filter_ctx = filt_ctx;
p->pad_idx = pad;
insert_inout(open_inputs, p);
}
......@@ -231,7 +231,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
if (!currlinkn)
return AVERROR(ENOMEM);
currlinkn->filter = filt_ctx;
currlinkn->filter_ctx = filt_ctx;
currlinkn->pad_idx = pad;
insert_inout(curr_inputs, currlinkn);
}
......@@ -293,8 +293,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
match = extract_inout(name, open_inputs);
if (match) {
if ((ret = link_filter(input->filter, input->pad_idx,
match->filter, match->pad_idx, log_ctx)) < 0)
if ((ret = link_filter(input->filter_ctx, input->pad_idx,
match->filter_ctx, match->pad_idx, log_ctx)) < 0)
return ret;
av_free(match->name);
av_free(name);
......
......@@ -30,7 +30,7 @@
*/
typedef struct AVFilterInOut {
char *name;
AVFilterContext *filter;
AVFilterContext *filter_ctx;
int pad_idx;
struct AVFilterInOut *next;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment