ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Fri Feb 24 11:16:26 2017 +0100| [353f509ee34823d8567904236c729b308ed94578] | committer: Carl Eugen Hoyos
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 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=353f509ee34823d8567904236c729b308ed94578 --- libswresample/rematrix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 4721063..03b9b20 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -371,9 +371,10 @@ av_cold static int auto_matrix(SwrContext *s) s->matrix[1] - s->matrix[0], s->matrix_encoding, s); if (ret >= 0 && s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { - int i; - for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++) - s->matrix_flt[0][i] = s->matrix[0][i]; + int i, j; + for (i = 0; i < FF_ARRAY_ELEMS(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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
