mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-23 18:01:50 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: dca: clear inactive subbands only once in qmf_32_subbands() vf_unsharp: set default chroma size value to 5x5 vf_unsharp: fix out-of-buffer read Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
30ba924bc8
@ -898,6 +898,9 @@ static void qmf_32_subbands(DCAContext * s, int chans,
|
||||
else /* Perfect reconstruction */
|
||||
prCoeff = fir_32bands_perfect;
|
||||
|
||||
for (i = sb_act; i < 32; i++)
|
||||
s->raXin[i] = 0.0;
|
||||
|
||||
/* Reconstructed channel sample index */
|
||||
for (subindex = 0; subindex < 8; subindex++) {
|
||||
/* Load in one sample from each subband and clear inactive subbands */
|
||||
@ -905,8 +908,6 @@ static void qmf_32_subbands(DCAContext * s, int chans,
|
||||
uint32_t v = AV_RN32A(&samples_in[i][subindex]) ^ ((i-1)&2)<<30;
|
||||
AV_WN32A(&s->raXin[i], v);
|
||||
}
|
||||
for (; i < 32; i++)
|
||||
s->raXin[i] = 0.0;
|
||||
|
||||
s->synth.synth_filter_float(&s->imdct,
|
||||
s->subband_fir_hist[chans], &s->hist_index[chans],
|
||||
|
Loading…
Reference in New Issue
Block a user