diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-07 18:40:18 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-07 18:40:18 +0000 |
| commit | 7313132bccc82fe379d88e37e407f842089ca630 (patch) | |
| tree | 62454a15f66e47d839e8c01ffa2e356c48f5dbfe /libavfilter | |
| parent | c24f76b948f3af894b52c8fe8ac041a1c974a372 (diff) | |
| download | ffmpeg-7313132bccc82fe379d88e37e407f842089ca630.tar.gz | |
Rename AVFilterInOut field filter to filter_ctx, more semantically correct.
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/graphparser.c | 12 | ||||
| -rw-r--r-- | libavfilter/graphparser.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 6256ddfd45..fe53351662 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -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); diff --git a/libavfilter/graphparser.h b/libavfilter/graphparser.h index 64fa0193af..2902524576 100644 --- a/libavfilter/graphparser.h +++ b/libavfilter/graphparser.h @@ -30,7 +30,7 @@ */ typedef struct AVFilterInOut { char *name; - AVFilterContext *filter; + AVFilterContext *filter_ctx; int pad_idx; struct AVFilterInOut *next; |