History

lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers

Nicolas George committed 5 years ago

Commit 24de2b71 parent 703c3c43 files · +6 −6Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 3 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+3−3
@@ -465,7 +465,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 464 unmodified lines
465465
466466 neg = ff_filter_get_negotiation(link);
467467 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++) {
469469 const AVFilterFormatsMerger *m = &neg->mergers[neg_step];
470470 void *a = FF_FIELD_AT(void *, m->offset, link->incfg);
471471 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
474474 break;
475475 }
476476 }
477− for (neg_step = 0; neg_step < neg->nb; neg_step++) {
477+ for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) {
478478 const AVFilterFormatsMerger *m = &neg->mergers[neg_step];
479479 void *a = FF_FIELD_AT(void *, m->offset, link->incfg);
480480 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
542542 av_assert0(outlink-> incfg.channel_layouts->refcount > 0);
543543 av_assert0(outlink->outcfg.channel_layouts->refcount > 0);
544544 }
545− for (neg_step = 0; neg_step < neg->nb; neg_step++) {
545+ for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) {
546546 const AVFilterFormatsMerger *m = &neg->mergers[neg_step];
547547 void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg);
548548 void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t