From 744a11c996641888d477a3981d609e79eeb69ea9 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 27 Jun 2013 02:50:52 +0200 Subject: qdm2: check and reset dithering index per channel Checking per subband would have the index exceed the dithering noise table size. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org --- libavcodec/qdm2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavcodec/qdm2.c') diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index fd1e7bb99c..6343ce3d5e 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -822,8 +822,6 @@ static void 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) @@ -847,6 +845,7 @@ static void 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; -- cgit v1.2.3