This is more consistent with naming in the rest of Libav.
Showing the changes to libavfilter/avfiltergraph.c (1 of 13 files). Show all
Unified · Split
| @@ -109,7 +109,7 @@ static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) · 108 unmodified lines | |||
| 109 | for (i = 0; i < graph->filter_count; i++) { | 109 | for (i = 0; i < graph->filter_count; i++) { |
| 110 | filt = graph->filters[i]; | 110 | filt = graph->filters[i]; |
| 111 | 111 | ||
| 112 | for (j = 0; j < filt->input_count; j++) { | 112 | for (j = 0; j < filt->nb_inputs; j++) { |
| 113 | if (!filt->inputs[j] || !filt->inputs[j]->src) { | 113 | if (!filt->inputs[j] || !filt->inputs[j]->src) { |
| 114 | av_log(log_ctx, AV_LOG_ERROR, | 114 | av_log(log_ctx, AV_LOG_ERROR, |
| 115 | "Input pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any source\n", | 115 | "Input pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any source\n", |
| @@ -118,7 +118,7 @@ static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) · 2 unmodified lines | |||
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | for (j = 0; j < filt->output_count; j++) { | 121 | for (j = 0; j < filt->nb_outputs; j++) { |
| 122 | if (!filt->outputs[j] || !filt->outputs[j]->dst) { | 122 | if (!filt->outputs[j] || !filt->outputs[j]->dst) { |
| 123 | av_log(log_ctx, AV_LOG_ERROR, | 123 | av_log(log_ctx, AV_LOG_ERROR, |
| 124 | "Output pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any destination\n", | 124 | "Output pad \"%s\" for the filter \"%s\" of type \"%s\" not connected to any destination\n", |
| @@ -144,7 +144,7 @@ static int graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) · 19 unmodified lines | |||
| 144 | for (i=0; i < graph->filter_count; i++) { | 144 | for (i=0; i < graph->filter_count; i++) { |
| 145 | filt = graph->filters[i]; | 145 | filt = graph->filters[i]; |
| 146 | 146 | ||
| 147 | if (!filt->output_count) { | 147 | if (!filt->nb_outputs) { |
| 148 | if ((ret = avfilter_config_links(filt))) | 148 | if ((ret = avfilter_config_links(filt))) |
| 149 | return ret; | 149 | return ret; |
| 150 | } | 150 | } |
| @@ -181,7 +181,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 30 unmodified lines | |||
| 181 | for (i = 0; i < graph->filter_count; i++) { | 181 | for (i = 0; i < graph->filter_count; i++) { |
| 182 | AVFilterContext *filter = graph->filters[i]; | 182 | AVFilterContext *filter = graph->filters[i]; |
| 183 | 183 | ||
| 184 | for (j = 0; j < filter->input_count; j++) { | 184 | for (j = 0; j < filter->nb_inputs; j++) { |
| 185 | AVFilterLink *link = filter->inputs[j]; | 185 | AVFilterLink *link = filter->inputs[j]; |
| 186 | int convert_needed = 0; | 186 | int convert_needed = 0; |
| 187 | 187 | ||
| @@ -315,7 +315,7 @@ static int pick_format(AVFilterLink *link) · 127 unmodified lines | |||
| 315 | 315 | ||
| 316 | #define REDUCE_FORMATS(fmt_type, list_type, list, var, nb, add_format) \ | 316 | #define REDUCE_FORMATS(fmt_type, list_type, list, var, nb, add_format) \ |
| 317 | do { \ | 317 | do { \ |
| 318 | for (i = 0; i < filter->input_count; i++) { \ | 318 | for (i = 0; i < filter->nb_inputs; i++) { \ |
| 319 | AVFilterLink *link = filter->inputs[i]; \ | 319 | AVFilterLink *link = filter->inputs[i]; \ |
| 320 | fmt_type fmt; \ | 320 | fmt_type fmt; \ |
| 321 | \ | 321 | \ |
| @@ -323,7 +323,7 @@ do { \ · 1 unmodified line | |||
| 323 | continue; \ | 323 | continue; \ |
| 324 | fmt = link->out_ ## list->var[0]; \ | 324 | fmt = link->out_ ## list->var[0]; \ |
| 325 | \ | 325 | \ |
| 326 | for (j = 0; j < filter->output_count; j++) { \ | 326 | for (j = 0; j < filter->nb_outputs; j++) { \ |
| 327 | AVFilterLink *out_link = filter->outputs[j]; \ | 327 | AVFilterLink *out_link = filter->outputs[j]; \ |
| 328 | list_type *fmts; \ | 328 | list_type *fmts; \ |
| 329 | \ | 329 | \ |
| @@ -380,19 +380,19 @@ static void swap_samplerates_on_filter(AVFilterContext *filter) · 50 unmodified lines | |||
| 380 | int sample_rate; | 380 | int sample_rate; |
| 381 | int i, j; | 381 | int i, j; |
| 382 | 382 | ||
| 383 | for (i = 0; i < filter->input_count; i++) { | 383 | for (i = 0; i < filter->nb_inputs; i++) { |
| 384 | link = filter->inputs[i]; | 384 | link = filter->inputs[i]; |
| 385 | 385 | ||
| 386 | if (link->type == AVMEDIA_TYPE_AUDIO && | 386 | if (link->type == AVMEDIA_TYPE_AUDIO && |
| 387 | link->out_samplerates->format_count == 1) | 387 | link->out_samplerates->format_count == 1) |
| 388 | break; | 388 | break; |
| 389 | } | 389 | } |
| 390 | if (i == filter->input_count) | 390 | if (i == filter->nb_inputs) |
| 391 | return; | 391 | return; |
| 392 | 392 | ||
| 393 | sample_rate = link->out_samplerates->formats[0]; | 393 | sample_rate = link->out_samplerates->formats[0]; |
| 394 | 394 | ||
| 395 | for (i = 0; i < filter->output_count; i++) { | 395 | for (i = 0; i < filter->nb_outputs; i++) { |
| 396 | AVFilterLink *outlink = filter->outputs[i]; | 396 | AVFilterLink *outlink = filter->outputs[i]; |
| 397 | int best_idx, best_diff = INT_MAX; | 397 | int best_idx, best_diff = INT_MAX; |
| 398 | 398 | ||
| @@ -427,19 +427,19 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter) · 28 unmodified lines | |||
| 427 | uint64_t chlayout; | 427 | uint64_t chlayout; |
| 428 | int i, j; | 428 | int i, j; |
| 429 | 429 | ||
| 430 | for (i = 0; i < filter->input_count; i++) { | 430 | for (i = 0; i < filter->nb_inputs; i++) { |
| 431 | link = filter->inputs[i]; | 431 | link = filter->inputs[i]; |
| 432 | 432 | ||
| 433 | if (link->type == AVMEDIA_TYPE_AUDIO && | 433 | if (link->type == AVMEDIA_TYPE_AUDIO && |
| 434 | link->out_channel_layouts->nb_channel_layouts == 1) | 434 | link->out_channel_layouts->nb_channel_layouts == 1) |
| 435 | break; | 435 | break; |
| 436 | } | 436 | } |
| 437 | if (i == filter->input_count) | 437 | if (i == filter->nb_inputs) |
| 438 | return; | 438 | return; |
| 439 | 439 | ||
| 440 | chlayout = link->out_channel_layouts->channel_layouts[0]; | 440 | chlayout = link->out_channel_layouts->channel_layouts[0]; |
| 441 | 441 | ||
| 442 | for (i = 0; i < filter->output_count; i++) { | 442 | for (i = 0; i < filter->nb_outputs; i++) { |
| 443 | AVFilterLink *outlink = filter->outputs[i]; | 443 | AVFilterLink *outlink = filter->outputs[i]; |
| 444 | int best_idx, best_score = INT_MIN; | 444 | int best_idx, best_score = INT_MIN; |
| 445 | 445 | ||
| @@ -480,20 +480,20 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 34 unmodified lines | |||
| 480 | int format, bps; | 480 | int format, bps; |
| 481 | int i, j; | 481 | int i, j; |
| 482 | 482 | ||
| 483 | for (i = 0; i < filter->input_count; i++) { | 483 | for (i = 0; i < filter->nb_inputs; i++) { |
| 484 | link = filter->inputs[i]; | 484 | link = filter->inputs[i]; |
| 485 | 485 | ||
| 486 | if (link->type == AVMEDIA_TYPE_AUDIO && | 486 | if (link->type == AVMEDIA_TYPE_AUDIO && |
| 487 | link->out_formats->format_count == 1) | 487 | link->out_formats->format_count == 1) |
| 488 | break; | 488 | break; |
| 489 | } | 489 | } |
| 490 | if (i == filter->input_count) | 490 | if (i == filter->nb_inputs) |
| 491 | return; | 491 | return; |
| 492 | 492 | ||
| 493 | format = link->out_formats->formats[0]; | 493 | format = link->out_formats->formats[0]; |
| 494 | bps = av_get_bytes_per_sample(format); | 494 | bps = av_get_bytes_per_sample(format); |
| 495 | 495 | ||
| 496 | for (i = 0; i < filter->output_count; i++) { | 496 | for (i = 0; i < filter->nb_outputs; i++) { |
| 497 | AVFilterLink *outlink = filter->outputs[i]; | 497 | AVFilterLink *outlink = filter->outputs[i]; |
| 498 | int best_idx, best_score = INT_MIN; | 498 | int best_idx, best_score = INT_MIN; |
| 499 | 499 | ||
| @@ -549,10 +549,10 @@ static int pick_formats(AVFilterGraph *graph) · 49 unmodified lines | |||
| 549 | for (i = 0; i < graph->filter_count; i++) { | 549 | for (i = 0; i < graph->filter_count; i++) { |
| 550 | AVFilterContext *filter = graph->filters[i]; | 550 | AVFilterContext *filter = graph->filters[i]; |
| 551 | 551 | ||
| 552 | for (j = 0; j < filter->input_count; j++) | 552 | for (j = 0; j < filter->nb_inputs; j++) |
| 553 | if ((ret = pick_format(filter->inputs[j])) < 0) | 553 | if ((ret = pick_format(filter->inputs[j])) < 0) |
| 554 | return ret; | 554 | return ret; |
| 555 | for (j = 0; j < filter->output_count; j++) | 555 | for (j = 0; j < filter->nb_outputs; j++) |
| 556 | if ((ret = pick_format(filter->outputs[j])) < 0) | 556 | if ((ret = pick_format(filter->outputs[j])) < 0) |
| 557 | return ret; | 557 | return ret; |
| 558 | } | 558 | } |