diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:43:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:43:12 +0200 |
| commit | af7949fdea2f3115c82143178a22a39afe7bbde1 (patch) | |
| tree | a13279b4b881c3dbd172b21f9ea69321f3d9596b /libavcodec/qcelpdec.c | |
| parent | e28fabb4cbe5e7c6cde8a63733d7530f283a0acb (diff) | |
| parent | 4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3 (diff) | |
| download | ffmpeg-af7949fdea2f3115c82143178a22a39afe7bbde1.tar.gz | |
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
cosmetics: Add '0' to float constants ending in '.'.
Conflicts:
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qcelpdec.c')
| -rw-r--r-- | libavcodec/qcelpdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index f8fe85de99..806ec65f78 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -94,7 +94,7 @@ static av_cold int qcelp_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLT; for (i = 0; i < 10; i++) - q->prev_lspf[i] = (i + 1) / 11.; + q->prev_lspf[i] = (i + 1) / 11.0; return 0; } @@ -162,7 +162,7 @@ static int decode_lspf(QCELPContext *q, float *lspf) } else { q->octave_count = 0; - tmp_lspf = 0.; + tmp_lspf = 0.0; for (i = 0; i < 5; i++) { lspf[2 * i + 0] = tmp_lspf += qcelp_lspvq[i][q->frame.lspv[i]][0] * 0.0001; lspf[2 * i + 1] = tmp_lspf += qcelp_lspvq[i][q->frame.lspv[i]][1] * 0.0001; @@ -434,7 +434,7 @@ static const float *do_pitchfilter(float memory[303], const float v_in[160], v_lag = memory + 143 + 40 * i - lag[i]; for (v_len = v_in + 40; v_in < v_len; v_in++) { if (pfrac[i]) { // If it is a fractional lag... - for (j = 0, *v_out = 0.; j < 4; j++) + for (j = 0, *v_out = 0.0; j < 4; j++) *v_out += qcelp_hammsinc_table[j] * (v_lag[j - 4] + v_lag[3 - j]); } else *v_out = *v_lag; |