diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-31 16:38:07 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-05-17 20:29:50 +0200 |
| commit | b01f6041f4260fba053c2f96ce1611ea77e833a0 (patch) | |
| tree | a25c3ecccfc7f802b9384dfcc598302f28109883 /libavfilter/formats.c | |
| parent | e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae (diff) | |
lavfi: rename AVFilterFormats.format_count to nb_formats
This is more consistent with naming in the rest of Libav.
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index c7b8075139..1441161daa 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -84,7 +84,7 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b) if (a == b) return a; - MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail); + MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail); return ret; fail: @@ -103,9 +103,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 { @@ -173,7 +173,7 @@ AVFilterFormats *ff_make_format_list(const int *fmts) formats = av_mallocz(sizeof(*formats)); if (count) formats->formats = av_malloc(sizeof(*formats->formats) * count); - formats->format_count = count; + formats->nb_formats = count; memcpy(formats->formats, fmts, sizeof(*formats->formats) * count); return formats; @@ -198,7 +198,7 @@ do { \ int ff_add_format(AVFilterFormats **avff, int fmt) { - ADD_FORMAT(avff, fmt, int, formats, format_count); + ADD_FORMAT(avff, fmt, int, formats, nb_formats); } int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout) |