to ff_msrle_decode() Originally committed as revision 16915 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -83,7 +83,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, | |||||
| } | } | ||||
| break; | break; | ||||
| case 1: | 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; | break; | ||||
| default: | default: | ||||
| av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); | 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; | buf = buf0 + hsize; | ||||
| } | } | ||||
| if(comp == BMP_RLE4 || comp == BMP_RLE8){ | 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{ | }else{ | ||||
| switch(depth){ | switch(depth){ | ||||
| case 1: | case 1: | ||||
| @@ -84,7 +84,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, | |||||
| s->avctx->palctrl->palette_changed = 0; | 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); | *data_size = sizeof(AVFrame); | ||||
| *(AVFrame*)data = s->frame; | *(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) | 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 */ | /* make the palette available on the way out */ | ||||
| if (c->avctx->pix_fmt == PIX_FMT_PAL8) { | if (c->avctx->pix_fmt == PIX_FMT_PAL8) { | ||||