diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
| commit | 6d1e9d993a5559ca5c4a578fce499c74528fe8d1 (patch) | |
| tree | e0bb88a7451876b192ef4254a6e3320ff75d260c /libavcodec/sh4 | |
| parent | ac8987591f5503768e7587c25693928f26fcb3d1 (diff) | |
| parent | 32ff6432284f713e9f837ee5b36fc8e9f1902836 (diff) | |
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
dsputil: remove avg_no_rnd_pixels8.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
| -rw-r--r-- | libavcodec/sh4/dsputil_align.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 88a86ac875..5636d935ea 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -294,11 +294,8 @@ DEFFUNC(put,no_rnd,xy,16,OP_XY,PACK) DEFFUNC(avg, rnd,o,8,OP_C,avg32) DEFFUNC(avg, rnd,x,8,OP_X,avg32) -DEFFUNC(avg,no_rnd,x,8,OP_X,avg32) DEFFUNC(avg, rnd,y,8,OP_Y,avg32) -DEFFUNC(avg,no_rnd,y,8,OP_Y,avg32) DEFFUNC(avg, rnd,xy,8,OP_XY,PACK) -DEFFUNC(avg,no_rnd,xy,8,OP_XY,PACK) DEFFUNC(avg, rnd,o,16,OP_C,avg32) DEFFUNC(avg, rnd,x,16,OP_X,avg32) DEFFUNC(avg,no_rnd,x,16,OP_X,avg32) @@ -311,7 +308,6 @@ DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK) #define put_no_rnd_pixels8_o put_rnd_pixels8_o #define put_no_rnd_pixels16_o put_rnd_pixels16_o -#define avg_no_rnd_pixels8_o avg_rnd_pixels8_o #define avg_no_rnd_pixels16_o avg_rnd_pixels16_o #define put_pixels8_c put_rnd_pixels8_o @@ -320,7 +316,6 @@ DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK) #define avg_pixels16_c avg_rnd_pixels16_o #define put_no_rnd_pixels8_c put_rnd_pixels8_o #define put_no_rnd_pixels16_c put_rnd_pixels16_o -#define avg_no_rnd_pixels8_c avg_rnd_pixels8_o #define avg_no_rnd_pixels16_c avg_rnd_pixels16_o #define QPEL @@ -367,10 +362,6 @@ void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) c->avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x; c->avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y; c->avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy; - c->avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels8_o; - c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels8_x; - c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels8_y; - c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels8_xy; } #ifdef QPEL |