virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

check MPV_frame_start() return value

Browse Source 
Originally committed as revision 4682 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-11-09 11:29:29 +00:00
parent 3712092e76
commit af8aa846fa
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@ -3089,11 +3089,12 @@ static int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static void frame_start(H264Context *h){ static int frame_start(H264Context *h){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
int i; int i;
MPV_frame_start(s, s->avctx); if(MPV_frame_start(s, s->avctx) < 0)
return -1;
ff_er_frame_start(s); ff_er_frame_start(s);
assert(s->linesize && s->uvlinesize); assert(s->linesize && s->uvlinesize);
@ -3115,6 +3116,7 @@ static void frame_start(H264Context *h){
s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize); 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; // 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){ 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 @@ static int decode_slice_header(H264Context *h){
} }
if(h->slice_num == 0){ 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 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup