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/aacdec.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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index a17fb2caf8..1bdc22d5c5 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1224,7 +1224,7 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, int run_end = band_type_run_end[idx]; if (band_type[idx] == ZERO_BT) { for (; i < run_end; i++, idx++) - sf[idx] = 0.; + sf[idx] = 0.0; } else if ((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) { for (; i < run_end; i++, idx++) { @@ -1968,7 +1968,7 @@ static int decode_cce(AACContext *ac, GetBitContext *gb, ChannelElement *che) int idx = 0; int cge = 1; int gain = 0; - float gain_cache = 1.; + float gain_cache = 1.0; if (c) { cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb); gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0; |