avfilter/af_astats: fix possible crash because of undefined float to integer rounding

[ffmpeg] / libswresample / rematrix.c

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index d0c4a212b3a8b3e3cf241d18b5bb021b461b42b4..94b3de88f6f727f18c1fcdd0a5c896b76a2c4c0f 100644 (file)
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -143,7 +143,7 @@ av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout
 
     if (in_ch_layout == AV_CH_LAYOUT_22POINT2 &&
         out_ch_layout != AV_CH_LAYOUT_22POINT2) {
-        in_ch_layout = AV_CH_LAYOUT_5POINT1_BACK;
+        in_ch_layout = (AV_CH_LAYOUT_7POINT1_WIDE_BACK|AV_CH_BACK_CENTER);
         av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout);
         av_log(log_context, AV_LOG_WARNING,
                "Full-on remixing from 22.2 has not yet been implemented! "