diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-17 22:02:58 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-19 22:37:45 -0800 |
| commit | 0e02b381b4850bbc5b8e1ce6e17447968a2ae8b5 (patch) | |
| tree | 807a8cdfa5e8c1e1cf50b5837268077d73a6517f /libavcodec | |
| parent | fef906c77c09940a2fdad155b2adc05080e17eda (diff) | |
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
The function is never used.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 3 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil_template.c | 4 | ||||
| -rw-r--r-- | libavcodec/vp3.c | 2 | ||||
| -rw-r--r-- | libavcodec/vp56.c | 6 |
5 files changed, 6 insertions, 11 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index b747e0a629..8e9c98d0d8 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2872,8 +2872,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\ c->add_pixels8 = FUNCC(add_pixels8 ## dct , depth);\ c->add_pixels4 = FUNCC(add_pixels4 ## dct , depth);\ - c->put_no_rnd_pixels_l2[0] = FUNCC(put_no_rnd_pixels16_l2, depth);\ - c->put_no_rnd_pixels_l2[1] = FUNCC(put_no_rnd_pixels8_l2 , depth);\ + c->put_no_rnd_pixels_l2 = FUNCC(put_no_rnd_pixels8_l2 , depth);\ \ c->put_h264_chroma_pixels_tab[0] = FUNCC(put_h264_chroma_mc8 , depth);\ c->put_h264_chroma_pixels_tab[1] = FUNCC(put_h264_chroma_mc4 , depth);\ diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 2de14f1b41..32a1e3e1d6 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -292,7 +292,7 @@ typedef struct DSPContext { */ op_pixels_func avg_no_rnd_pixels_tab[4][4]; - void (*put_no_rnd_pixels_l2[2])(uint8_t *block/*align width (8 or 16)*/, const uint8_t *a/*align 1*/, const uint8_t *b/*align 1*/, int line_size, int h); + void (*put_no_rnd_pixels_l2)(uint8_t *block/*align 8*/, const uint8_t *a/*align 1*/, const uint8_t *b/*align 1*/, int line_size, int h); /** * Thirdpel motion compensation with rounding (a+b+1)>>1. diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 13f7628b2e..b9d5e97bc0 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -582,10 +582,6 @@ PIXOP2(put, op_put) #define put_no_rnd_pixels8_c put_pixels8_c #define put_no_rnd_pixels16_c put_pixels16_c -static void FUNCC(put_no_rnd_pixels16_l2)(uint8_t *dst, const uint8_t *a, const uint8_t *b, int stride, int h){ - FUNC(put_no_rnd_pixels16_l2)(dst, a, b, stride, stride, stride, h); -} - static void FUNCC(put_no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *a, const uint8_t *b, int stride, int h){ FUNC(put_no_rnd_pixels8_l2)(dst, a, b, stride, stride, stride, h); } diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9417535314..58db8908db 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1564,7 +1564,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) motion_source, stride, 8); }else{ int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1 - s->dsp.put_no_rnd_pixels_l2[1]( + s->dsp.put_no_rnd_pixels_l2( output_plane + first_pixel, motion_source - d, motion_source + stride + 1 + d, diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index c3c9cb2914..c05d38ea10 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -373,9 +373,9 @@ static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, s->filter(s, dst, src_block, src_offset, src_offset+overlap_offset, stride, s->mv[b], mask, s->filter_selection, b<4); else - s->dsp.put_no_rnd_pixels_l2[1](dst, src_block+src_offset, - src_block+src_offset+overlap_offset, - stride, 8); + s->dsp.put_no_rnd_pixels_l2(dst, src_block+src_offset, + src_block+src_offset+overlap_offset, + stride, 8); } else { s->dsp.put_pixels_tab[1][0](dst, src_block+src_offset, stride, 8); } |