Showing the changes to libavfilter/avfiltergraph.c (1 of 3 files). Show all
Unified · Split
| @@ -465,7 +465,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 464 unmodified lines | |||
| 465 | 465 | ||
| 466 | neg = ff_filter_get_negotiation(link); | 466 | neg = ff_filter_get_negotiation(link); |
| 467 | av_assert0(neg); | 467 | av_assert0(neg); |
| 468 | for (neg_step = 1; neg_step < neg->nb; neg_step++) { | 468 | for (neg_step = 1; neg_step < neg->nb_mergers; neg_step++) { |
| 469 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; | 469 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; |
| 470 | void *a = FF_FIELD_AT(void *, m->offset, link->incfg); | 470 | void *a = FF_FIELD_AT(void *, m->offset, link->incfg); |
| 471 | void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); | 471 | void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); |
| @@ -474,7 +474,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 2 unmodified lines | |||
| 474 | break; | 474 | break; |
| 475 | } | 475 | } |
| 476 | } | 476 | } |
| 477 | for (neg_step = 0; neg_step < neg->nb; neg_step++) { | 477 | for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { |
| 478 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; | 478 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; |
| 479 | void *a = FF_FIELD_AT(void *, m->offset, link->incfg); | 479 | void *a = FF_FIELD_AT(void *, m->offset, link->incfg); |
| 480 | void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); | 480 | void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); |
| @@ -542,7 +542,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 61 unmodified lines | |||
| 542 | av_assert0(outlink-> incfg.channel_layouts->refcount > 0); | 542 | av_assert0(outlink-> incfg.channel_layouts->refcount > 0); |
| 543 | av_assert0(outlink->outcfg.channel_layouts->refcount > 0); | 543 | av_assert0(outlink->outcfg.channel_layouts->refcount > 0); |
| 544 | } | 544 | } |
| 545 | for (neg_step = 0; neg_step < neg->nb; neg_step++) { | 545 | for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { |
| 546 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; | 546 | const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; |
| 547 | void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg); | 547 | void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg); |
| 548 | void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg); | 548 | void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg); |