diff options
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 016aecd38e..ae8a45694a 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -108,8 +108,8 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, To avoid that, pretend that there are no common formats to force the insertion of a conversion filter. */ if (type == AVMEDIA_TYPE_VIDEO) - for (i = 0; i < a->format_count; i++) - for (j = 0; j < b->format_count; j++) { + for (i = 0; i < a->nb_formats; i++) + for (j = 0; j < b->nb_formats; j++) { const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]); const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]); alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA; @@ -124,7 +124,7 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, if (alpha2 > alpha1 || chroma2 > chroma1) return NULL; - MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail); + MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail); return ret; fail: @@ -143,9 +143,9 @@ AVFilterFormats *ff_merge_samplerates(AVFilterFormats *a, if (a == b) return a; - if (a->format_count && b->format_count) { - MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail); - } else if (a->format_count) { + if (a->nb_formats && b->nb_formats) { + MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail); + } else if (a->nb_formats) { MERGE_REF(a, b, formats, AVFilterFormats, fail); ret = a; } else { @@ -307,7 +307,7 @@ int64_t *ff_copy_int64_list(const int64_t * const list) AVFilterFormats *ff_make_format_list(const int *fmts) { - MAKE_FORMAT_LIST(AVFilterFormats, formats, format_count); + MAKE_FORMAT_LIST(AVFilterFormats, formats, nb_formats); while (count--) formats->formats[count] = fmts[count]; @@ -343,7 +343,7 @@ do { \ int ff_add_format(AVFilterFormats **avff, int64_t fmt) { - ADD_FORMAT(avff, fmt, int, formats, format_count); + ADD_FORMAT(avff, fmt, int, formats, nb_formats); return 0; } |