Commit 60dcaa87 authored by michael's avatar michael

quantizer overflow warning + AAN dct fix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3754 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bf4c8313
......@@ -164,7 +164,15 @@ static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[
}
for(i=intra; i<64; i++){
while(((8191LL * qmat[qscale][i]) >> shift) > INT_MAX){
int64_t max= 8191;
if (dsp->fdct == fdct_ifast
#ifndef FAAN_POSTSCALE
|| dsp->fdct == ff_faandct
#endif
) {
max= (8191LL*aanscales[i]) >> 14;
}
while(((max * qmat[qscale][i]) >> shift) > INT_MAX){
shift++;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment