Add type cast of result of av_clipl_int32() to 64 bit to avoid overflow in
addition later.
Fixes fate failure with clang ftrapv.
Signed-off-by: Nedeljko Babic <nedeljko.ba...@imgtec.com>
---
libavcodec/aacdec_template.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 13653a8..eb14bd9 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -2749,8 +2749,8 @@ static void spectral_to_sample(AACContext *ac, int
samples)
int j;
/* preparation for resampler */
for(j = 0; j<samples; j++){
- che->ch[0].ret[j] =
(int32_t)av_clipl_int32((int64_t)che->ch[0].ret[j]<<7)+0x8000;
- che->ch[1].ret[j] =
(int32_t)av_clipl_int32((int64_t)che->ch[1].ret[j]<<7)+0x8000;
+ che->ch[0].ret[j] =
(int32_t)((int64_t)av_clipl_int32((int64_t)che->ch[0].ret[j]<<7)+0x8000);
+ che->ch[1].ret[j] =
(int32_t)((int64_t)av_clipl_int32((int64_t)che->ch[1].ret[j]<<7)+0x8000);
}
}
#endif /* USE_FIXED */
--
1.8.2.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
