diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:40:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:46:09 +0200 |
| commit | 74cb7ef8514846e97b28973f1884ea9d2afbc018 (patch) | |
| tree | 0927d815157b564cd2bea4b4918962b31fe02611 /libavfilter/filtfmts.c | |
| parent | 937af7f6d3e71e959028ddc75cb115533f560fbc (diff) | |
| parent | b01f6041f4260fba053c2f96ce1611ea77e833a0 (diff) | |
| download | ffmpeg-74cb7ef8514846e97b28973f1884ea9d2afbc018.tar.gz | |
Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
lavfi: rename AVFilterFormats.format_count to nb_formats
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/filtfmts.c')
| -rw-r--r-- | libavfilter/filtfmts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c index 61b002d119..93150d3c9d 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts.c @@ -35,7 +35,7 @@ static void print_formats(AVFilterContext *filter_ctx) if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_VIDEO) { \ AVFilterFormats *fmts = \ filter_ctx->inout##puts[i]->outin##_formats; \ - for (j = 0; j < fmts->format_count; j++) \ + for (j = 0; j < fmts->nb_formats; j++) \ if(av_get_pix_fmt_name(fmts->formats[j])) \ printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ i, filter_ctx->filter->inout##puts[i].name, \ @@ -45,7 +45,7 @@ static void print_formats(AVFilterContext *filter_ctx) AVFilterChannelLayouts *layouts; \ \ fmts = filter_ctx->inout##puts[i]->outin##_formats; \ - for (j = 0; j < fmts->format_count; j++) \ + for (j = 0; j < fmts->nb_formats; j++) \ printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ i, filter_ctx->filter->inout##puts[i].name, \ av_get_sample_fmt_name(fmts->formats[j])); \ |