Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter/graphparser.c (1 of 4 files). Show all
Unified · Split
| @@ -207,13 +207,13 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 206 unmodified lines | ||
| 207 | 207 | |
| 208 | 208 | *curr_inputs = (*curr_inputs)->next; |
| 209 | 209 | |
| 210 | − if (p->filter) { | |
| 211 | − if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0) | |
| 210 | + if (p->filter_ctx) { | |
| 211 | + if ((ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx)) < 0) | |
| 212 | 212 | return ret; |
| 213 | 213 | av_free(p->name); |
| 214 | 214 | av_free(p); |
| 215 | 215 | } else { |
| 216 | − p->filter = filt_ctx; | |
| 216 | + p->filter_ctx = filt_ctx; | |
| 217 | 217 | p->pad_idx = pad; |
| 218 | 218 | insert_inout(open_inputs, p); |
| 219 | 219 | } |
| @@ -231,7 +231,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 11 unmodified lines | ||
| 231 | 231 | AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut)); |
| 232 | 232 | if (!currlinkn) |
| 233 | 233 | return AVERROR(ENOMEM); |
| 234 | − currlinkn->filter = filt_ctx; | |
| 234 | + currlinkn->filter_ctx = filt_ctx; | |
| 235 | 235 | currlinkn->pad_idx = pad; |
| 236 | 236 | insert_inout(curr_inputs, currlinkn); |
| 237 | 237 | } |
| @@ -293,8 +293,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, · 55 unmodified lines | ||
| 293 | 293 | match = extract_inout(name, open_inputs); |
| 294 | 294 | |
| 295 | 295 | if (match) { |
| 296 | − if ((ret = link_filter(input->filter, input->pad_idx, | |
| 297 | − match->filter, match->pad_idx, log_ctx)) < 0) | |
| 296 | + if ((ret = link_filter(input->filter_ctx, input->pad_idx, | |
| 297 | + match->filter_ctx, match->pad_idx, log_ctx)) < 0) | |
| 298 | 298 | return ret; |
| 299 | 299 | av_free(match->name); |
| 300 | 300 | av_free(name); |