From 902bfa5b22083f4959de775e2f8f278785d6ff02 Mon Sep 17 00:00:00 2001 From: Nedeljko Babic Date: Wed, 29 Jul 2015 16:46:18 +0200 Subject: [PATCH] avcodec/aacdec_fixed: Fix preparation for resampler 2nd channel makes sense only for CPE type. Skip 2nd channel in preparation for resampler (in spectral_to _sample()) depending on block type. Fixes fate failure with clang ftrapv. Signed-off-by: Nedeljko Babic Signed-off-by: Michael Niedermayer --- libavcodec/aacdec_template.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 13653a873b5..2f270bcb191 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -2750,7 +2750,8 @@ static void spectral_to_sample(AACContext *ac, int samples) /* preparation for resampler */ for(j = 0; jch[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; + if(type == TYPE_CPE) + che->ch[1].ret[j] = (int32_t)av_clipl_int32((int64_t)che->ch[1].ret[j]<<7)+0x8000; } } #endif /* USE_FIXED */ -- 2.39.2