[SCM] libav/experimental: Fix integer overflow warnings in h264.h

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:00 UTC 2013


The following commit has been merged in the experimental branch:
commit cd12c37729ec4a2433d3835af89e5039611f5950
Author: Alexander Strange <astrange at ithinksw.com>
Date:   Sat Feb 13 20:57:13 2010 +0000

    Fix integer overflow warnings in h264.h
    
    Fixes:
    h264.h: In function 'fill_filter_caches':
    h264.h:1216:73: warning: integer overflow in expression
    h264.h:1307:81: warning: integer overflow in expression
    
    Originally committed as revision 21813 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index d8dbff7..c0d214a 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1215,7 +1215,7 @@ static int fill_filter_caches(H264Context *h, int mb_type){
                 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
                 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] =
                 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
-                *(uint32_t*)&h->ref_cache[list][scan8[10]] = ((LIST_NOT_USED)&0xFF)*0x01010101;
+                *(uint32_t*)&h->ref_cache[list][scan8[10]] = ((LIST_NOT_USED)&0xFF)*0x01010101U;
                 continue;
             }
 
@@ -1306,7 +1306,7 @@ static int fill_filter_caches(H264Context *h, int mb_type){
                 h->ref_cache[list][scan8[0] + 3 - 1*8]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 1]];
             }else{
                 AV_ZERO128(h->mv_cache[list][scan8[0] + 0 - 1*8]);
-                *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((LIST_NOT_USED)&0xFF)*0x01010101;
+                *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((LIST_NOT_USED)&0xFF)*0x01010101U;
             }
 
             if(!IS_INTERLACED(mb_type^left_type[0])){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list