Skip to content

F
ffmpeg.wasm-core
Commit 4d1418cd authored by Mans Rullgard's avatar Mans Rullgard
Browse files
Options

h264: fix signed overflows in x*0x01010101 expressions 

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent d66b9dec
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/h264.c
View file @ 4d1418cd
...@@ -1668,7 +1668,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty ...@@ -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; tr_high= ((uint16_t*)ptr)[3 - linesize/2]*0x0001000100010001ULL;
topright= (uint8_t*) &tr_high; topright= (uint8_t*) &tr_high;
} else { } else {
tr= ptr[3 - linesize]*0x01010101; tr= ptr[3 - linesize]*0x01010101u;
topright= (uint8_t*) &tr; topright= (uint8_t*) &tr;
} }
}else }else
......
libavcodec/h264_mvpred.h
View file @ 4d1418cd
...@@ -588,7 +588,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ ...@@ -588,7 +588,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
ref_cache[3 - 1*8]= ref[4*top_xy + 3]; ref_cache[3 - 1*8]= ref[4*top_xy + 3];
}else{ }else{
AV_ZERO128(mv_cache[0 - 1*8]); 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)){ if(mb_type & (MB_TYPE_16x8|MB_TYPE_8x8)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment