[FFmpeg-cvslog] avcodec/imc: cast float to int prior to comparing with int variable
Kostya Shishkov
git at videolan.org
Sat Jul 1 22:43:28 EEST 2017
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Mon Jun 26 12:41:13 2017 +0200| [06a66e7d9496adde91a54f3641eec321a093e5a5] | committer: Paul B Mahol
avcodec/imc: cast float to int prior to comparing with int variable
Update FATE test.
Fixes #3886.
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06a66e7d9496adde91a54f3641eec321a093e5a5
---
libavcodec/imc.c | 2 +-
tests/fate/audio.mak | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index ac209206d1..7cd6db930b 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -828,7 +828,7 @@ static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx)
for (j = band_tab[i]; j < band_tab[i + 1]; j++)
chctx->sumLenArr[i] += chctx->CWlengthT[j];
if (chctx->bandFlagsBuf[i])
- if ((((band_tab[i + 1] - band_tab[i]) * 1.5) > chctx->sumLenArr[i]) && (chctx->sumLenArr[i] > 0))
+ if (((int)((band_tab[i + 1] - band_tab[i]) * 1.5) > chctx->sumLenArr[i]) && (chctx->sumLenArr[i] > 0))
chctx->skipFlagRaw[i] = 1;
}
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index d6fa18cb2f..40c4ca7b75 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -26,7 +26,7 @@ fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30
FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, IMC) += fate-imc
fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi
fate-imc: CMP = oneoff
-fate-imc: REF = $(SAMPLES)/imc/imc.pcm
+fate-imc: REF = $(SAMPLES)/imc/imc-201706.pcm
FATE_SAMPLES_AUDIO-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv
More information about the ffmpeg-cvslog
mailing list