projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2fef0bd
)
quantizer overflow warning + AAN dct fix
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 14 Dec 2004 20:17:23 +0000
(20:17 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 14 Dec 2004 20:17:23 +0000
(20:17 +0000)
Originally committed as revision 3754 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegvideo.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
2b0b315
..
0190c91
100644
(file)
--- a/
libavcodec/mpegvideo.c
+++ b/
libavcodec/mpegvideo.c
@@
-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++;
}
}