git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
e1f98f2
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Jul 2013 03:15:10 +0000
(
05:15
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Jul 2013 03:26:17 +0000
(
05:26
+0200)
* qatar/master:
qdm2: check and reset dithering index per channel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdm2.c
patch
|
blob
|
history
diff --git
a/libavcodec/qdm2.c
b/libavcodec/qdm2.c
index
b113d0a
..
7684590
100644
(file)
--- 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;