Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)
* commit '92a36a6b3338df5f5cff573a486e182005367c24':
  pngdec: correctly indent macros

Conflicts:
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pngdec.c

@@@ -205,16 -180,24 +206,21 @@@ void ff_add_png_paeth_prediction(uint8_
                  continue;                                                     \
              dst[i + 3] = a = op(a, src[i + 3], last[i + 3]);                  \
          }                                                                     \
- }
    }
  
- #define UNROLL_FILTER(op)\
-          if (bpp == 1) UNROLL1(1, op)\
-     else if (bpp == 2) UNROLL1(2, op)\
-     else if (bpp == 3) UNROLL1(3, op)\
-     else if (bpp == 4) UNROLL1(4, op)\
-     for (; i < size; i++) {\
-         dst[i] = op(dst[i - bpp], src[i], last[i]);\
-     }\
+ #define UNROLL_FILTER(op)                                                     \
+     if (bpp == 1) {                                                           \
+         UNROLL1(1, op)                                                        \
+     } else if (bpp == 2) {                                                    \
+         UNROLL1(2, op)                                                        \
+     } else if (bpp == 3) {                                                    \
+         UNROLL1(3, op)                                                        \
+     } else if (bpp == 4) {                                                    \
+         UNROLL1(4, op)                                                        \
 -    } else {                                                                  \
 -        for (; i < size; i += bpp) {                                          \
 -            int j;                                                            \
 -            for (j = 0; j < bpp; j++)                                         \
 -                dst[i + j] = op(dst[i + j - bpp], src[i + j], last[i + j]);   \
 -        }                                                                     \
++    }                                                                         \
++    for (; i < size; i++) {                                                   \
++        dst[i] = op(dst[i - bpp], src[i], last[i]);                           \
+     }
  
  /* NOTE: 'dst' can be equal to 'last' */
  static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,