diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-01-22 02:05:10 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-02 21:38:21 +0200 |
| commit | da4b64ea02c6bc7b91e79a9bb5d684288614401c (patch) | |
| tree | f0b9f2f305c65e928606b8d71cbef8bf186f9df5 | |
| parent | 9f011f0876b1bb1fba0f776539a98e71f5315dd6 (diff) | |
| download | ffmpeg-da4b64ea02c6bc7b91e79a9bb5d684288614401c.tar.gz | |
avfilter/asrc_sine: Fix invalid left shift of negative number
by using a multiplication instead. The multiplication can never overflow
an int because the sin-factor is only an int16_t.
Affected the FATE-tests filter-concat and filter-concat-vfr.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 55b46902c1f855d02ea802de1285d68577a38806)
| -rw-r--r-- | libavfilter/asrc_sine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c index 6fe080efb6..3b7d2e6d00 100644 --- a/libavfilter/asrc_sine.c +++ b/libavfilter/asrc_sine.c @@ -247,7 +247,7 @@ static int request_frame(AVFilterLink *outlink) samples[i] = sine->sin[sine->phi >> (32 - LOG_PERIOD)]; sine->phi += sine->dphi; if (sine->beep_index < sine->beep_length) { - samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] << 1; + samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] * 2; sine->phi_beep += sine->dphi_beep; } if (++sine->beep_index == sine->beep_period) |