[SCM] libav/experimental: overflow fix

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:43:53 UTC 2013


The following commit has been merged in the experimental branch:
commit 6b51185c63fd70e342ce3d2979c556cda92ee564
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun May 8 09:58:41 2005 +0000

    overflow fix
    
    Originally committed as revision 4201 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4857dcb..4aaee76 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -5378,7 +5378,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
         for(i=1;i<64;i++){
             int j= s->dsp.idct_permutation[i];
 
-            s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
+            s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF;
         }
         convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, 
                        s->intra_matrix, s->intra_quant_bias, 8, 8, 1);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list