diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-04-26 14:00:43 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-04-26 17:07:43 +0100 |
| commit | 0a07f2b346433a9a2677c69c6b29a1a827e39109 (patch) | |
| tree | 213d0c152484a18434b70d771fc7ee59b6d97230 /libavcodec/dsputil.c | |
| parent | 3510a13307226a0280d30b7f3fca6fbd962ecd9d (diff) | |
| download | ffmpeg-0a07f2b346433a9a2677c69c6b29a1a827e39109.tar.gz | |
dsputil: fix invalid array indexing
Indexing outside an array is invalid and causes errors with
gcc 4.8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 8add2bd981..f42c58516f 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2680,7 +2680,7 @@ int ff_check_alignment(void){ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) { - int i; + int i, j; ff_check_alignment(); @@ -3022,11 +3022,15 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx); if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx); - for(i=0; i<64; i++){ - if(!c->put_2tap_qpel_pixels_tab[0][i]) - c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i]; - if(!c->avg_2tap_qpel_pixels_tab[0][i]) - c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i]; + for (i = 0; i < 4; i++) { + for (j = 0; j < 16; j++) { + if(!c->put_2tap_qpel_pixels_tab[i][j]) + c->put_2tap_qpel_pixels_tab[i][j] = + c->put_h264_qpel_pixels_tab[i][j]; + if(!c->avg_2tap_qpel_pixels_tab[i][j]) + c->avg_2tap_qpel_pixels_tab[i][j] = + c->avg_h264_qpel_pixels_tab[i][j]; + } } ff_init_scantable_permutation(c->idct_permutation, |