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/vf_extractplanes.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/vf_extractplanes.c')
| -rw-r--r-- | libavfilter/vf_extractplanes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 3c629d7a83..52dffccdcb 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -100,7 +100,7 @@ static int query_formats(AVFilterContext *ctx) int i, depth = 0, be = 0; if (!ctx->inputs[0]->in_formats || - !ctx->inputs[0]->in_formats->format_count) { + !ctx->inputs[0]->in_formats->nb_formats) { return AVERROR(EAGAIN); } @@ -111,7 +111,7 @@ static int query_formats(AVFilterContext *ctx) desc = av_pix_fmt_desc_get(avff->formats[0]); depth = desc->comp[0].depth_minus1; be = desc->flags & AV_PIX_FMT_FLAG_BE; - for (i = 1; i < avff->format_count; i++) { + for (i = 1; i < avff->nb_formats; i++) { desc = av_pix_fmt_desc_get(avff->formats[i]); if (depth != desc->comp[0].depth_minus1 || be != (desc->flags & AV_PIX_FMT_FLAG_BE)) { |