History

lavfi: rename AVFilterFormats.format_count to nb_formats

This is more consistent with naming in the rest of Libav.

Anton Khirnov committed 13 years ago

Commit b01f6041 parent e27f4b75 files · +21 −21Browse files

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

Unified · Split

libavfilter/avfiltergraph.c+11−11
@@ -341,17 +341,17 @@ static int pick_format(AVFilterLink *link) · 340 unmodified lines
341341 if (!link || !link->in_formats)
342342 return 0;
343343
344− link->in_formats->format_count = 1;
344+ link->in_formats->nb_formats = 1;
345345 link->format = link->in_formats->formats[0];
346346
347347 if (link->type == AVMEDIA_TYPE_AUDIO) {
348− if (!link->in_samplerates->format_count) {
348+ if (!link->in_samplerates->nb_formats) {
349349 av_log(link->src, AV_LOG_ERROR, "Cannot select sample rate for"
350350 " the link between filters %s and %s.\n", link->src->name,
351351 link->dst->name);
352352 return AVERROR(EINVAL);
353353 }
354− link->in_samplerates->format_count = 1;
354+ link->in_samplerates->nb_formats = 1;
355355 link->sample_rate = link->in_samplerates->formats[0];
356356
357357 if (!link->in_channel_layouts->nb_channel_layouts) {
@@ -414,9 +414,9 @@ static int reduce_formats_on_filter(AVFilterContext *filter) · 56 unmodified lines
414414 int i, j, k, ret = 0;
415415
416416 REDUCE_FORMATS(int, AVFilterFormats, formats, formats,
417− format_count, ff_add_format);
417+ nb_formats, ff_add_format);
418418 REDUCE_FORMATS(int, AVFilterFormats, samplerates, formats,
419− format_count, ff_add_format);
419+ nb_formats, ff_add_format);
420420 REDUCE_FORMATS(uint64_t, AVFilterChannelLayouts, channel_layouts,
421421 channel_layouts, nb_channel_layouts, ff_add_channel_layout);
422422
@@ -445,7 +445,7 @@ static void swap_samplerates_on_filter(AVFilterContext *filter) · 22 unmodified lines
445445 link = filter->inputs[i];
446446
447447 if (link->type == AVMEDIA_TYPE_AUDIO &&
448− link->out_samplerates->format_count == 1)
448+ link->out_samplerates->nb_formats== 1)
449449 break;
450450 }
451451 if (i == filter->nb_inputs)
@@ -458,10 +458,10 @@ static void swap_samplerates_on_filter(AVFilterContext *filter) · 6 unmodified lines
458458 int best_idx, best_diff = INT_MAX;
459459
460460 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
461− outlink->in_samplerates->format_count < 2)
461+ outlink->in_samplerates->nb_formats < 2)
462462 continue;
463463
464− for (j = 0; j < outlink->in_samplerates->format_count; j++) {
464+ for (j = 0; j < outlink->in_samplerates->nb_formats; j++) {
465465 int diff = abs(sample_rate - outlink->in_samplerates->formats[j]);
466466
467467 if (diff < best_diff) {
@@ -607,7 +607,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 139 unmodified lines
607607 link = filter->inputs[i];
608608
609609 if (link->type == AVMEDIA_TYPE_AUDIO &&
610− link->out_formats->format_count == 1)
610+ link->out_formats->nb_formats == 1)
611611 break;
612612 }
613613 if (i == filter->nb_inputs)
@@ -621,10 +621,10 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 7 unmodified lines
621621 int best_idx = -1, best_score = INT_MIN;
622622
623623 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
624− outlink->in_formats->format_count < 2)
624+ outlink->in_formats->nb_formats < 2)
625625 continue;
626626
627− for (j = 0; j < outlink->in_formats->format_count; j++) {
627+ for (j = 0; j < outlink->in_formats->nb_formats; j++) {
628628 int out_format = outlink->in_formats->formats[j];
629629 int out_bps = av_get_bytes_per_sample(out_format);
630630 int score;

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