diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-24 12:05:06 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-02-24 12:05:06 +0100 |
| commit | e568d432b1d89b9d24025cf13df7505edff1f11f (patch) | |
| tree | 8927d1d280ca9483922d8b7e7cc82c3a04390f30 /libavfilter | |
| parent | 2d98dd3d142b5905852571a9c4c5d873945b2a37 (diff) | |
| download | ffmpeg-e568d432b1d89b9d24025cf13df7505edff1f11f.tar.gz | |
lavfi/formats: reindent after last commit.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/formats.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 58762806bf..43718e4655 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -108,17 +108,17 @@ 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++) { - 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 & PIX_FMT_ALPHA; - chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1; - if (a->formats[i] == b->formats[j]) { - alpha1 |= adesc->flags & PIX_FMT_ALPHA; - chroma1|= adesc->nb_components > 1; + for (i = 0; i < a->format_count; i++) + for (j = 0; j < b->format_count; 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 & PIX_FMT_ALPHA; + chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1; + if (a->formats[i] == b->formats[j]) { + alpha1 |= adesc->flags & PIX_FMT_ALPHA; + chroma1|= adesc->nb_components > 1; + } } - } // If chroma or alpha can be lost through merging then do not merge if (alpha2 > alpha1 || chroma2 > chroma1) |