diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 18:15:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 18:15:29 +0100 |
| commit | 1e7a92f219a8e245128773491346d64c1e6c85fa (patch) | |
| tree | 45b9df7bd1bab1b34920165d20802068d3f37bf1 /libavcodec/arm | |
| parent | f900fd5d31dcabc138a0f96511ddbf8e9a279765 (diff) | |
| parent | baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76 (diff) | |
| download | ffmpeg-1e7a92f219a8e245128773491346d64c1e6c85fa.tar.gz | |
Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_init_neon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 75e67f6643..3928328301 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -196,10 +196,10 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_neon; c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_neon; - c->avg_no_rnd_pixels_tab[0][0] = ff_avg_pixels16_neon; - c->avg_no_rnd_pixels_tab[0][1] = ff_avg_pixels16_x2_no_rnd_neon; - c->avg_no_rnd_pixels_tab[0][2] = ff_avg_pixels16_y2_no_rnd_neon; - c->avg_no_rnd_pixels_tab[0][3] = ff_avg_pixels16_xy2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[0] = ff_avg_pixels16_neon; + c->avg_no_rnd_pixels_tab[1] = ff_avg_pixels16_x2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[2] = ff_avg_pixels16_y2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[3] = ff_avg_pixels16_xy2_no_rnd_neon; } c->add_pixels_clamped = ff_add_pixels_clamped_neon; |