Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -311,26 +311,26 @@ static int query_formats(AVFilterContext *ctx) · 310 unmodified lines | |||
| 311 | return ff_set_common_formats(ctx, fmts_list); | 311 | return ff_set_common_formats(ctx, fmts_list); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | static int config_props(AVFilterLink *link) | 314 | static int config_output(AVFilterLink *outlink) |
| 315 | { | 315 | { |
| 316 | AVFilterContext *ctx = link->src; | 316 | AVFilterContext *ctx = outlink->src; |
| 317 | YADIFContext *s = ctx->priv; | 317 | YADIFContext *s = ctx->priv; |
| 318 | 318 | ||
| 319 | link->time_base.num = ctx->inputs[0]->time_base.num; | 319 | outlink->time_base.num = ctx->inputs[0]->time_base.num; |
| 320 | link->time_base.den = ctx->inputs[0]->time_base.den * 2; | 320 | outlink->time_base.den = ctx->inputs[0]->time_base.den * 2; |
| 321 | link->w = ctx->inputs[0]->w; | 321 | outlink->w = ctx->inputs[0]->w; |
| 322 | link->h = ctx->inputs[0]->h; | 322 | outlink->h = ctx->inputs[0]->h; |
| 323 | 323 | ||
| 324 | if(s->mode & 1) | 324 | if(s->mode & 1) |
| 325 | link->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, | 325 | outlink->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, |
| 326 | (AVRational){2, 1}); | 326 | (AVRational){2, 1}); |
| 327 | 327 | ||
| 328 | if (link->w < 3 || link->h < 3) { | 328 | if (outlink->w < 3 || outlink->h < 3) { |
| 329 | av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); | 329 | av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); |
| 330 | return AVERROR(EINVAL); | 330 | return AVERROR(EINVAL); |
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | s->csp = av_pix_fmt_desc_get(link->format); | 333 | s->csp = av_pix_fmt_desc_get(outlink->format); |
| 334 | s->filter = filter; | 334 | s->filter = filter; |
| 335 | if (s->csp->comp[0].depth > 8) { | 335 | if (s->csp->comp[0].depth > 8) { |
| 336 | s->filter_line = filter_line_c_16bit; | 336 | s->filter_line = filter_line_c_16bit; |
| @@ -369,7 +369,7 @@ static const AVFilterPad avfilter_vf_yadif_outputs[] = { · 32 unmodified lines | |||
| 369 | .name = "default", | 369 | .name = "default", |
| 370 | .type = AVMEDIA_TYPE_VIDEO, | 370 | .type = AVMEDIA_TYPE_VIDEO, |
| 371 | .request_frame = ff_yadif_request_frame, | 371 | .request_frame = ff_yadif_request_frame, |
| 372 | .config_props = config_props, | 372 | .config_props = config_output, |
| 373 | }, | 373 | }, |
| 374 | { NULL } | 374 | { NULL } |
| 375 | }; | 375 | }; |