diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-10-08 21:19:51 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-10-09 12:27:19 +0100 |
| commit | 4d1418cd4f620b382106542d0f33d96e33a0fdae (patch) | |
| tree | c7417a660bdaee4d673e5d703f14348462542984 | |
| parent | d66b9dec116847400323ca15ee709529b237cdf1 (diff) | |
| download | ffmpeg-4d1418cd4f620b382106542d0f33d96e33a0fdae.tar.gz | |
h264: fix signed overflows in x*0x01010101 expressions
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264_mvpred.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 83c26eff29..aac1a15a92 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1668,7 +1668,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty tr_high= ((uint16_t*)ptr)[3 - linesize/2]*0x0001000100010001ULL; topright= (uint8_t*) &tr_high; } else { - tr= ptr[3 - linesize]*0x01010101; + tr= ptr[3 - linesize]*0x01010101u; topright= (uint8_t*) &tr; } }else diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 4751928211..7c7086d440 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -588,7 +588,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ ref_cache[3 - 1*8]= ref[4*top_xy + 3]; }else{ AV_ZERO128(mv_cache[0 - 1*8]); - AV_WN32A(&ref_cache[0 - 1*8], ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101); + AV_WN32A(&ref_cache[0 - 1*8], ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101u); } if(mb_type & (MB_TYPE_16x8|MB_TYPE_8x8)){ |