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/alpha | |
| parent | ac8987591f5503768e7587c25693928f26fcb3d1 (diff) | |
| parent | 32ff6432284f713e9f837ee5b36fc8e9f1902836 (diff) | |
| download | ffmpeg-6d1e9d993a5559ca5c4a578fce499c74528fe8d1.tar.gz | |
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/alpha')
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index 7cfc1cb62b..e2a51bc64c 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -308,11 +308,6 @@ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx) c->avg_pixels_tab[1][2] = avg_pixels_y2_axp; c->avg_pixels_tab[1][3] = avg_pixels_xy2_axp; - c->avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels_axp; - c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels_x2_axp; - c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels_y2_axp; - c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels_xy2_axp; - c->clear_blocks = clear_blocks_axp; } |