highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AVFilterInOut field filter to filter_ctx, more semantically correct.

Browse Source 
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-11-07 18:40:18 +00:00
parent c24f76b948
commit 7313132bcc
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -388,12 +388,12 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost)
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
outputs->name = av_strdup("in"); outputs->name = av_strdup("in");
outputs->filter = last_filter; outputs->filter_ctx = last_filter;
outputs->pad_idx = 0; outputs->pad_idx = 0;
outputs->next = NULL; outputs->next = NULL;
inputs->name = av_strdup("out"); inputs->name = av_strdup("out");
inputs->filter = ist->output_video_filter; inputs->filter_ctx = ist->output_video_filter;
inputs->pad_idx = 0; inputs->pad_idx = 0;
inputs->next = NULL; inputs->next = NULL;

4
ffplay.c
View File

@ -1811,12 +1811,12 @@ static int video_thread(void *arg)
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
outputs->name = av_strdup("in"); outputs->name = av_strdup("in");
outputs->filter = filt_src; outputs->filter_ctx = filt_src;
outputs->pad_idx = 0; outputs->pad_idx = 0;
outputs->next = NULL; outputs->next = NULL;
inputs->name = av_strdup("out"); inputs->name = av_strdup("out");
inputs->filter = filt_out; inputs->filter_ctx = filt_out;
inputs->pad_idx = 0; inputs->pad_idx = 0;
inputs->next = NULL; inputs->next = NULL;

12
libavfilter/graphparser.c
View File

@ -207,13 +207,13 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
*curr_inputs = (*curr_inputs)->next; *curr_inputs = (*curr_inputs)->next;
if (p->filter) { if (p->filter_ctx) {
if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0) if ((ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
return ret; return ret;
av_free(p->name); av_free(p->name);
av_free(p); av_free(p);
} else { } else {
p->filter = filt_ctx; p->filter_ctx = filt_ctx;
p->pad_idx = pad; p->pad_idx = pad;
insert_inout(open_inputs, p); insert_inout(open_inputs, p);
} }
@ -231,7 +231,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut)); AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
if (!currlinkn) if (!currlinkn)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
currlinkn->filter = filt_ctx; currlinkn->filter_ctx = filt_ctx;
currlinkn->pad_idx = pad; currlinkn->pad_idx = pad;
insert_inout(curr_inputs, currlinkn); 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); match = extract_inout(name, open_inputs);
if (match) { if (match) {
if ((ret = link_filter(input->filter, input->pad_idx, if ((ret = link_filter(input->filter_ctx, input->pad_idx,
match->filter, match->pad_idx, log_ctx)) < 0) match->filter_ctx, match->pad_idx, log_ctx)) < 0)
return ret; return ret;
av_free(match->name); av_free(match->name);
av_free(name); av_free(name);

2
libavfilter/graphparser.h
View File

@ -30,7 +30,7 @@
*/ */
typedef struct AVFilterInOut { typedef struct AVFilterInOut {
char *name; char *name;
AVFilterContext *filter; AVFilterContext *filter_ctx;
int pad_idx; int pad_idx;
struct AVFilterInOut *next; struct AVFilterInOut *next;