RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mans Rullgard 2012-04-26 14:00:43 +01:00
parent 3510a13307
commit 0a07f2b346
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/dsputil.c
View File

@ -2680,7 +2680,7 @@ int ff_check_alignment(void){
av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
{ {
int i; int i, j;
ff_check_alignment(); 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_SH4) ff_dsputil_init_sh4 (c, avctx);
if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx); if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx);
for(i=0; i<64; i++){ for (i = 0; i < 4; i++) {
if(!c->put_2tap_qpel_pixels_tab[0][i]) for (j = 0; j < 16; j++) {
c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i]; if(!c->put_2tap_qpel_pixels_tab[i][j])
if(!c->avg_2tap_qpel_pixels_tab[0][i]) c->put_2tap_qpel_pixels_tab[i][j] =
c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i]; 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, ff_init_scantable_permutation(c->idct_permutation,