# HG changeset patch # User michael # Date 1131535769 0 # Node ID b564bb15e63c76eeb68bbadff8cecb08577a93c4 # Parent 6ade4702eb976d76d0559886577ab09fad9d6f6a check MPV_frame_start() return value diff -r 6ade4702eb97 -r b564bb15e63c h264.c --- a/h264.c Wed Nov 09 08:50:55 2005 +0000 +++ b/h264.c Wed Nov 09 11:29:29 2005 +0000 @@ -3089,11 +3089,12 @@ return 0; } -static void frame_start(H264Context *h){ +static int frame_start(H264Context *h){ MpegEncContext * const s = &h->s; int i; - MPV_frame_start(s, s->avctx); + if(MPV_frame_start(s, s->avctx) < 0) + return -1; ff_er_frame_start(s); assert(s->linesize && s->uvlinesize); @@ -3115,6 +3116,7 @@ s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize); // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; + return 0; } static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ @@ -4290,7 +4292,8 @@ } if(h->slice_num == 0){ - frame_start(h); + if(frame_start(h) < 0) + return -1; } s->current_picture_ptr->frame_num= //FIXME frame_num cleanup