Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:58:16 +0000 (21:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:58:16 +0000 (21:58 +0100)
* commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e':
  arm: dsputil: K&R formatting cosmetics

Conflicts:
libavcodec/arm/dsputil_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dsputil_arm.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c

Simple merge
@@@ -68,9 -71,9 +71,9 @@@ av_cold void ff_dsputil_init_arm(DSPCon
      ff_put_pixels_clamped = c->put_pixels_clamped;
      ff_add_pixels_clamped = c->add_pixels_clamped;
  
 -    if (avctx->bits_per_raw_sample <= 8) {
 +    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8) {
-         if(avctx->idct_algo == FF_IDCT_AUTO ||
-            avctx->idct_algo == FF_IDCT_ARM){
+         if (avctx->idct_algo == FF_IDCT_AUTO ||
+             avctx->idct_algo == FF_IDCT_ARM) {
              c->idct_put              = j_rev_dct_arm_put;
              c->idct_add              = j_rev_dct_arm_add;
              c->idct                  = ff_j_rev_dct_arm;
Simple merge
Simple merge