[FFmpeg-cvslog] lavfi/formats: reindent after last commit.

Nicolas George git at videolan.org
Sun Feb 24 12:07:50 CET 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Feb 24 12:05:06 2013 +0100| [e568d432b1d89b9d24025cf13df7505edff1f11f] | committer: Nicolas George

lavfi/formats: reindent after last commit.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e568d432b1d89b9d24025cf13df7505edff1f11f
---

 libavfilter/formats.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 5876280..43718e4 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)



More information about the ffmpeg-cvslog mailing list