diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:15:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:26:17 +0200 |
| commit | 44d0e520f85ac5087e53b99fc844fd9acaeb5fcf (patch) | |
| tree | b29ee1ffe119bff282ce0693ee54094d173ccc67 | |
| parent | e1f98f22313bfde3c85ac566902adeb118ec6d18 (diff) | |
| parent | 744a11c996641888d477a3981d609e79eeb69ea9 (diff) | |
| download | ffmpeg-44d0e520f85ac5087e53b99fc844fd9acaeb5fcf.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qdm2: check and reset dithering index per channel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/qdm2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index b113d0af95..76845909f6 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -830,8 +830,6 @@ static int synthfilt_build_sb_samples(QDM2Context *q, GetBitContext *gb, } for (sb = sb_min; sb < sb_max; sb++) { - FIX_NOISE_IDX(q->noise_idx); - channels = q->nb_channels; if (q->nb_channels <= 1 || sb < 12) @@ -860,6 +858,7 @@ static int synthfilt_build_sb_samples(QDM2Context *q, GetBitContext *gb, } for (ch = 0; ch < channels; ch++) { + FIX_NOISE_IDX(q->noise_idx); zero_encoding = (get_bits_left(gb) >= 1) ? get_bits1(gb) : 0; type34_predictor = 0.0; type34_first = 1; |