Merge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4'

[ffmpeg] / libavcodec / mlpdsp.c

diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c
index 3ae8c377081fc81cde7828097f9080ab9fb2a18f..2fc453c1f01a1b3426979e2a75a01774af89e182 100644 (file)
--- a/libavcodec/mlpdsp.c
+++ b/libavcodec/mlpdsp.c
@@ -113,8 +113,8 @@ int32_t ff_mlp_pack_output(int32_t lossless_check_data,
     for (i = 0; i < blockpos; i++) {
         for (out_ch = 0; out_ch <= max_matrix_channel; out_ch++) {
             int mat_ch = ch_assign[out_ch];
-            int32_t sample = sample_buffer[i][mat_ch]
-                          << output_shift[mat_ch];
+            int32_t sample = sample_buffer[i][mat_ch] *
+                          (1 << output_shift[mat_ch]);
             lossless_check_data ^= (sample & 0xffffff) << mat_ch;
             if (is32)
                 *data_32++ = sample << 8;