aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-26 06:03:49 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-02 21:39:19 +0200
commita8fb9c9d2740c54adb5192f02207a32a66f29618 (patch)
tree1715e799cce7b009b9f9dd018efd4af4c779da05
parent5e2e8e1b9e2877062ae881ae68a69b4e12f6ed13 (diff)
downloadffmpeg-a8fb9c9d2740c54adb5192f02207a32a66f29618.tar.gz
avcodec/dcaenc: Fix undefined left shift of negative numbers
Affected the acodec-dca and acodec-dca2 FATE tests. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit 659a925939011338cac1ab3c21d58d4b077fc926)
-rw-r--r--libavcodec/dcaenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index a40d2e0ca0..87fb5f5457 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -925,10 +925,10 @@ static void fill_in_adpcm_bufer(DCAEncContext *c)
* But there are no proper value in decoder history, so likely result will be no good.
* Bitstream has "Predictor history flag switch", but this flag disables history for all subbands
*/
- samples[0] = c->adpcm_history[ch][band][0] << 7;
- samples[1] = c->adpcm_history[ch][band][1] << 7;
- samples[2] = c->adpcm_history[ch][band][2] << 7;
- samples[3] = c->adpcm_history[ch][band][3] << 7;
+ samples[0] = c->adpcm_history[ch][band][0] * (1 << 7);
+ samples[1] = c->adpcm_history[ch][band][1] * (1 << 7);
+ samples[2] = c->adpcm_history[ch][band][2] * (1 << 7);
+ samples[3] = c->adpcm_history[ch][band][3] * (1 << 7);
}
}
}