virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avoid overflows of qp and pic_type

Browse Source 
Originally committed as revision 5746 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefan Gehrer 2006-07-14 18:38:23 +00:00
parent 3409385da6
commit 643326f747
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/cavs.c
View File

@ -716,7 +716,7 @@ static inline int decode_residual_inter(AVSContext *h) {
/* get quantizer */ /* get quantizer */
if(h->cbp && !h->qp_fixed) if(h->cbp && !h->qp_fixed)
h->qp += get_se_golomb(&h->s.gb); h->qp = (h->qp + get_se_golomb(&h->s.gb)) & 63;
for(block=0;block<4;block++) for(block=0;block<4;block++)
if(h->cbp & (1<<block)) if(h->cbp & (1<<block))
decode_residual_block(h,&h->s.gb,inter_2dvlc,0,h->qp, decode_residual_block(h,&h->s.gb,inter_2dvlc,0,h->qp,
@ -876,7 +876,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) {
} }
h->cbp = cbp_tab[cbp_code][0]; h->cbp = cbp_tab[cbp_code][0];
if(h->cbp && !h->qp_fixed) if(h->cbp && !h->qp_fixed)
h->qp += get_se_golomb(gb); //qp_delta h->qp = (h->qp + get_se_golomb(gb)) & 63; //qp_delta
/* luma intra prediction interleaved with residual decode/transform/add */ /* luma intra prediction interleaved with residual decode/transform/add */
for(block=0;block<4;block++) { for(block=0;block<4;block++) {
@ -1154,6 +1154,10 @@ static int decode_pic(AVSContext *h) {
get_bits(&s->gb,16);//bbv_dwlay get_bits(&s->gb,16);//bbv_dwlay
if(h->stc == PIC_PB_START_CODE) { if(h->stc == PIC_PB_START_CODE) {
h->pic_type = get_bits(&s->gb,2) + FF_I_TYPE; h->pic_type = get_bits(&s->gb,2) + FF_I_TYPE;
if(h->pic_type > FF_B_TYPE) {
av_log(s->avctx, AV_LOG_ERROR, "illegal picture type\n");
return -1;
}
/* make sure we have the reference frames we need */ /* make sure we have the reference frames we need */
if(!h->DPB[0].data[0] || if(!h->DPB[0].data[0] ||
(!h->DPB[1].data[0] && h->pic_type == FF_B_TYPE)) (!h->DPB[1].data[0] && h->pic_type == FF_B_TYPE))