Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bink.c
libavcodec/binkdsp.c
libavcodec/binkdsp.h
libavcodec/dsputil.c
libavcodec/dsputil.h

Simple merge
@@@ -128,6 -129,25 +129,25 @@@ static void scale_block_c(const uint8_
      }
  }
  
 -static void add_pixels8_c(uint8_t *restrict pixels, int16_t *block,
++static void add_pixels8_c(uint8_t *av_restrict pixels, int16_t *block,
+                           int line_size)
+ {
+     int i;
+     for (i = 0; i < 8; i++) {
+         pixels[0] += block[0];
+         pixels[1] += block[1];
+         pixels[2] += block[2];
+         pixels[3] += block[3];
+         pixels[4] += block[4];
+         pixels[5] += block[5];
+         pixels[6] += block[6];
+         pixels[7] += block[7];
+         pixels    += line_size;
+         block     += 8;
+     }
+ }
  av_cold void ff_binkdsp_init(BinkDSPContext *c)
  {
      c->idct_add    = bink_idct_add_c;
Simple merge
@@@ -381,26 -347,7 +381,7 @@@ static void put_signed_pixels_clamped_c
      }
  }
  
- static void add_pixels8_c(uint8_t *av_restrict pixels, int16_t *block,
-                           int line_size)
- {
-     int i;
-     for (i = 0; i < 8; i++) {
-         pixels[0] += block[0];
-         pixels[1] += block[1];
-         pixels[2] += block[2];
-         pixels[3] += block[3];
-         pixels[4] += block[4];
-         pixels[5] += block[5];
-         pixels[6] += block[6];
-         pixels[7] += block[7];
-         pixels    += line_size;
-         block     += 8;
-     }
- }
 -static void add_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels,
 +static void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,
                                   int line_size)
  {
      int i;
Simple merge