changeset 2390:ce45e1dd4b09 libavcodec

quantizer overflow warning + AAN dct fix
author michael
date Tue, 14 Dec 2004 20:17:23 +0000
parents 429c1eedeee9
children 336a239ad9a4
files mpegvideo.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo.c	Tue Dec 14 12:04:45 2004 +0000
+++ b/mpegvideo.c	Tue Dec 14 20:17:23 2004 +0000
@@ -164,7 +164,15 @@
         }
         
         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++;
             }
         }