lswr/rematrix: Remove an aggressive loop optimization.

Fixes undefined behaviour and a gcc warning:
libswresample/rematrix.c:376:47: warning: iteration 64 invokes undefined behavior
This commit is contained in:
Carl Eugen Hoyos 2017-02-24 11:16:26 +01:00
parent d34bf886e9
commit 353f509ee3

View File

@ -371,9 +371,10 @@ av_cold static int auto_matrix(SwrContext *s)
s->matrix[1] - s->matrix[0], s->matrix_encoding, s); s->matrix[1] - s->matrix[0], s->matrix_encoding, s);
if (ret >= 0 && s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { if (ret >= 0 && s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) {
int i; int i, j;
for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++) for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0]); i++)
s->matrix_flt[0][i] = s->matrix[0][i]; for (j = 0; j < FF_ARRAY_ELEMS(s->matrix[0]); j++)
s->matrix_flt[i][j] = s->matrix[i][j];
} }
return ret; return ret;