Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:14:08 +0000 (11:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:17:32 +0000 (11:17 +0100)
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0':
  h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil

Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264_mb_template.c
libavcodec/h264addpx_template.c
libavcodec/h264dsp.c
libavcodec/h264dsp.h

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

@@@ -463,8 -423,7 +463,7 @@@ static void add_pixels8_c(uint8_t *av_r
      }
  }
  
 -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;
@@@ -2216,7 -2141,7 +2216,7 @@@ static av_always_inline void hl_decode_
          } else {
              if (transform_bypass) {
                  idct_dc_add  =
-                     idct_add = h->h264dsp.h264_add_pixels4_clear;
 -                idct_add     = h->h264dsp.h264_add_pixels4;
++                idct_add     = h->h264dsp.h264_add_pixels4_clear;
              } else {
                  idct_dc_add = h->h264dsp.h264_idct_dc_add;
                  idct_add    = h->h264dsp.h264_idct_add;