ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Sep 3 21:58:59 2015 +0200| [e5aa6f702130f1afd53c61d058c2ebc48e61e9ea] | committer: Michael Niedermayer
avcodec/gsmdec_template: avoid undefined negative left shifts Fixes: unknown_unknown_338_824_cov_1045285351_sample-gsm-8000.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5aa6f702130f1afd53c61d058c2ebc48e61e9ea --- libavcodec/gsmdec_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/gsmdec_template.c b/libavcodec/gsmdec_template.c index 0c60813..4cb777c 100644 --- a/libavcodec/gsmdec_template.c +++ b/libavcodec/gsmdec_template.c @@ -64,7 +64,7 @@ static inline int decode_log_area(int coded, int factor, int offset) { coded <<= 10; coded -= offset; - return gsm_mult(coded, factor) << 1; + return gsm_mult(coded, factor) * 2; } static av_noinline int get_rrp(int filtered) @@ -121,7 +121,7 @@ static int postprocess(int16_t *data, int msr) int i; for (i = 0; i < 160; i++) { msr = av_clip_int16(data[i] + gsm_mult(msr, 28180)); - data[i] = av_clip_int16(msr << 1) & ~7; + data[i] = av_clip_int16(msr * 2) & ~7; } return msr; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
