Commit 5d44b2a1 authored by Kostya Shishkov's avatar Kostya Shishkov

Silence useless compiler warning when passing AVFrame* instead of AVPicture*

to ff_msrle_decode()

Originally committed as revision 16915 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bc4cccd4
......@@ -83,7 +83,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
}
break;
case 1:
ff_msrle_decode(avctx, &s->frame, 8, buf - 4, buf_size + 4);
ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, buf - 4, buf_size + 4);
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
......
......@@ -240,7 +240,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf = buf0 + hsize;
}
if(comp == BMP_RLE4 || comp == BMP_RLE8){
ff_msrle_decode(avctx, p, depth, buf, dsize);
ff_msrle_decode(avctx, (AVPicture*)p, depth, buf, dsize);
}else{
switch(depth){
case 1:
......
......@@ -84,7 +84,7 @@ static int msrle_decode_frame(AVCodecContext *avctx,
s->avctx->palctrl->palette_changed = 0;
}
ff_msrle_decode(avctx, &s->frame, avctx->bits_per_coded_sample, buf, buf_size);
ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
......
......@@ -105,7 +105,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
if(zret != Z_DATA_ERROR)
ff_msrle_decode(avctx, &c->pic, c->bpp, c->decomp_buf, c->zstream.avail_out);
ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->zstream.avail_out);
/* make the palette available on the way out */
if (c->avctx->pix_fmt == PIX_FMT_PAL8) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment