aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-30 02:13:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-30 02:19:36 +0200
commit30ba924bc8cec04f53089adbf4ef51b52c4b4b72 (patch)
tree13362ba331b30bdcdd133739b2eaf704dae52fee /libavcodec/dca.c
parent5d7e3d71673d64a16b58430a0027afadb6b3a54e (diff)
parentbf00a73ace9b1aba790b75dcb26d43adfceb769f (diff)
downloadffmpeg-30ba924bc8cec04f53089adbf4ef51b52c4b4b72.tar.gz
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>
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r--libavcodec/dca.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 762821c3dc..ace89d436f 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -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],