* 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>
}
}
-
-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;
} 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;