From 2ed008204d5467be03a0a3af1e293b2f7038d0a0 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 11 Feb 2013 17:04:27 -0800 Subject: h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Martin Storsjö --- libavcodec/h264_mb_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h264_mb_template.c') diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 7ff7edd2cd..fdefed4304 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -207,7 +207,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) h->mb + (16 * 16 * 2 << PIXEL_SHIFT), uvlinesize); } else { - idct_add = h->dsp.add_pixels4; + idct_add = h->h264dsp.h264_add_pixels4; for (j = 1; j < 3; j++) { for (i = j * 16; i < j * 16 + 4; i++) if (h->non_zero_count_cache[scan8[i]] || -- cgit v1.2.3