# HG changeset patch # User bcoudurier # Date 1242352913 0 # Node ID 5c9d3a72aabfc34e7dd8d592adf357a4ccd42110 # Parent d706b300b89fc5b1e694591dfeaaa193a144b515 change pic type to Picture* and remove casts diff -r d706b300b89f -r 5c9d3a72aabf mpegvideo.c --- a/mpegvideo.c Thu May 14 19:03:22 2009 +0000 +++ b/mpegvideo.c Fri May 15 02:01:53 2009 +0000 @@ -869,7 +869,7 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) { int i; - AVFrame *pic; + Picture *pic; s->mb_skipped = 0; assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); @@ -901,10 +901,10 @@ } if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) - pic= (AVFrame*)s->current_picture_ptr; //we already have a unused image (maybe it was set before reading the header) + pic= s->current_picture_ptr; //we already have a unused image (maybe it was set before reading the header) else{ i= ff_find_unused_picture(s, 0); - pic= (AVFrame*)&s->picture[i]; + pic= &s->picture[i]; } pic->reference= 0; @@ -917,10 +917,10 @@ pic->coded_picture_number= s->coded_picture_number++; - if( alloc_picture(s, (Picture*)pic, 0) < 0) + if(alloc_picture(s, pic, 0) < 0) return -1; - s->current_picture_ptr= (Picture*)pic; + s->current_picture_ptr= pic; s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; }