[FFmpeg-cvslog] avcodec/nellymoserenc: fix sign error
Michael Niedermayer
git at videolan.org
Thu Nov 13 21:13:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 20:40:37 2014 +0100| [5c805d69a49a1f32a7a8a1b16fb3d631d85ca56d] | committer: Michael Niedermayer
avcodec/nellymoserenc: fix sign error
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c805d69a49a1f32a7a8a1b16fb3d631d85ca56d
---
libavcodec/nellymoserenc.c | 2 +-
tests/fate/audio.mak | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 9bbdd52..78f1092 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -175,7 +175,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
/* Generate overlap window */
ff_init_ff_sine_windows(7);
for (i = 0; i < POW_TABLE_SIZE; i++)
- pow_table[i] = -pow(2, -i / 2048.0 - 3.0 + POW_TABLE_OFFSET);
+ pow_table[i] = pow(2, -i / 2048.0 - 3.0 + POW_TABLE_OFFSET);
if (s->avctx->trellis) {
s->opt = av_malloc(NELLY_BANDS * OPT_SIZE * sizeof(float ));
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index aa58dfc..b7e5362 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -44,8 +44,8 @@ fate-nellymoser-aref-encode: $(AREF) ./tests/data/asynth-16000-1.wav
fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
fate-nellymoser-aref-encode: CMP = stddev
fate-nellymoser-aref-encode: REF = ./tests/data/asynth-16000-1.wav
-fate-nellymoser-aref-encode: CMP_SHIFT = -244
-fate-nellymoser-aref-encode: CMP_TARGET = 9612
+fate-nellymoser-aref-encode: CMP_SHIFT = -256
+fate-nellymoser-aref-encode: CMP_TARGET = 3863
fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
More information about the ffmpeg-cvslog
mailing list