Browse Source

Remove pointless AVFrame* casting.

Originally committed as revision 14011 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Alexander Strange 17 years ago
parent
commit
b6a66897b6
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      libavcodec/mdec.c

+ 4
- 4
libavcodec/mdec.c View File

@@ -157,7 +157,7 @@ static int decode_frame(AVCodecContext *avctx,
{ {
MDECContext * const a = avctx->priv_data; MDECContext * const a = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame * const p= (AVFrame*)&a->picture;
AVFrame * const p= &a->picture;
int i; int i;


if(p->data[0]) if(p->data[0])
@@ -200,7 +200,7 @@ static int decode_frame(AVCodecContext *avctx,
p->quality= a->qscale * FF_QP2LAMBDA; p->quality= a->qscale * FF_QP2LAMBDA;
memset(p->qscale_table, a->qscale, p->qstride*a->mb_height); memset(p->qscale_table, a->qscale, p->qstride*a->mb_height);


*picture= *(AVFrame*)&a->picture;
*picture = a->picture;
*data_size = sizeof(AVPicture); *data_size = sizeof(AVPicture);


return (get_bits_count(&a->gb)+31)/32*4; return (get_bits_count(&a->gb)+31)/32*4;
@@ -214,13 +214,13 @@ static av_cold void mdec_common_init(AVCodecContext *avctx){
a->mb_width = (avctx->coded_width + 15) / 16; a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16; a->mb_height = (avctx->coded_height + 15) / 16;


avctx->coded_frame= (AVFrame*)&a->picture;
avctx->coded_frame= &a->picture;
a->avctx= avctx; a->avctx= avctx;
} }


static av_cold int decode_init(AVCodecContext *avctx){ static av_cold int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data; MDECContext * const a = avctx->priv_data;
AVFrame *p= (AVFrame*)&a->picture;
AVFrame *p= &a->picture;


mdec_common_init(avctx); mdec_common_init(avctx);
init_vlcs(); init_vlcs();


Loading…
Cancel
Save