Fixes undefined behaviour and a gcc warning: libswresample/rematrix.c:376:47: warning: iteration 64 invokes undefined behavior
Unified · Split
| @@ -371,9 +371,10 @@ av_cold static int auto_matrix(SwrContext *s) · 370 unmodified lines | ||
| 371 | 371 | s->matrix[1] - s->matrix[0], s->matrix_encoding, s); |
| 372 | 372 | |
| 373 | 373 | if (ret >= 0 && s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { |
| 374 | − int i; | |
| 375 | − for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++) | |
| 376 | − s->matrix_flt[0][i] = s->matrix[0][i]; | |
| 374 | + int i, j; | |
| 375 | + for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0]); i++) | |
| 376 | + for (j = 0; j < FF_ARRAY_ELEMS(s->matrix[0]); j++) | |
| 377 | + s->matrix_flt[i][j] = s->matrix[i][j]; | |
| 377 | 378 | } |
| 378 | 379 | |
| 379 | 380 | return ret; |