]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/formats: Cosmetics
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fri, 14 Aug 2020 17:21:18 +0000 (19:21 +0200)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 20 Aug 2020 22:28:51 +0000 (00:28 +0200)
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavfilter/formats.c

index 78f698745ca1d7acfd331dfb275689d87bce4432..8918118b8e9344de5c3b10f2556c7a17766591a6 100644 (file)
@@ -62,9 +62,9 @@ do {                                                                       \
  * merged; otherwise, it is treated as error.
  */
 #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed)          \
-do {                                                                            \
+do {                                                                       \
     int i, j, k = 0, skip = 0;                                             \
-                                                                                \
+                                                                           \
     if (empty_allowed) {                                                   \
         if (!a->nb || !b->nb) {                                            \
             if (check)                                                     \
@@ -75,20 +75,20 @@ do {
         }                                                                  \
     }                                                                      \
     if (!skip) {                                                           \
-        for (i = 0; i < a->nb; i++)                                             \
-            for (j = 0; j < b->nb; j++)                                         \
-                if (a->fmts[i] == b->fmts[j]) {                                 \
+        for (i = 0; i < a->nb; i++)                                        \
+            for (j = 0; j < b->nb; j++)                                    \
+                if (a->fmts[i] == b->fmts[j]) {                            \
                     if (check)                                             \
                         return 1;                                          \
                     a->fmts[k++] = a->fmts[i];                             \
-                    break;                                                      \
-                }                                                               \
-    /* Check that there was at least one common format.                    \
-     * Notice that both a and b are unchanged if not. */                   \
-    if (!k)                                                                \
-        return 0;                                                          \
-    av_assert2(!check);                                                    \
-    a->nb = k;                                                             \
+                    break;                                                 \
+                }                                                          \
+        /* Check that there was at least one common format.                \
+         * Notice that both a and b are unchanged if not. */               \
+        if (!k)                                                            \
+            return 0;                                                      \
+        av_assert2(!check);                                                \
+        a->nb = k;                                                         \
     }                                                                      \
                                                                            \
     MERGE_REF(a, b, fmts, type, return AVERROR(ENOMEM););                  \