virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

segfault fix

Browse Source 
Originally committed as revision 418 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-04-22 21:02:18 +00:00
parent 5751432312
commit d697b89bab
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h263.c
View File

@ -359,8 +359,13 @@ void mpeg4_encode_mb(MpegEncContext * s,
uint8_t *p_pic= s->new_picture[0] + offset; uint8_t *p_pic= s->new_picture[0] + offset;
s->mb_skiped=1; s->mb_skiped=1;
for(i=0; i<s->max_b_frames; i++){ for(i=0; i<s->max_b_frames; i++){
uint8_t *b_pic= s->coded_order[i+1].picture[0] + offset; uint8_t *b_pic;
int diff= pix_abs16x16(p_pic, b_pic, s->linesize); int diff;
if(s->coded_order[i+1].pict_type!=B_TYPE) break;
b_pic= s->coded_order[i+1].picture[0] + offset;
diff= pix_abs16x16(p_pic, b_pic, s->linesize);
if(diff>s->qscale*70){ if(diff>s->qscale*70){
s->mb_skiped=0; s->mb_skiped=0;
break; break;

1
libavcodec/mpegvideo.c
View File

@ -645,6 +645,7 @@ void reorder_input(MpegEncContext *s, AVPicture *pict)
s->coded_order[j]= s->coded_order[j+1]; s->coded_order[j]= s->coded_order[j+1];
} }
s->coded_order[j].picture[0]= s->coded_order[j].picture[1]= s->coded_order[j].picture[2]= NULL; //catch uninitalized buffers s->coded_order[j].picture[0]= s->coded_order[j].picture[1]= s->coded_order[j].picture[2]= NULL; //catch uninitalized buffers
s->coded_order[j].pict_type=0;
switch(s->input_pict_type){ switch(s->input_pict_type){
default: default: