diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-02-11 17:04:27 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 02:14:16 +0100 |
| commit | 7ff1a4b10f2d7f9a4ae1c72e1259b4ed7d13e316 (patch) | |
| tree | dafa300b66ea1b51f466f2531b15c1a3c5ca5b1c /libavcodec/h264_mb_template.c | |
| parent | 5260edee7e5bd975837696c8c8c1a80eb2fbd7c1 (diff) | |
| download | ffmpeg-7ff1a4b10f2d7f9a4ae1c72e1259b4ed7d13e316.tar.gz | |
Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 679021f437..0f0e4510eb 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -205,7 +205,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) h->mb + (16 * 16 * 2 << PIXEL_SHIFT), uvlinesize); } else { - idct_add = s->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]] || |