diff options
| -rw-r--r-- | libavcodec/aasc.c | 4 | ||||
| -rw-r--r-- | libavcodec/bmp.c | 2 | ||||
| -rw-r--r-- | libavcodec/msrle.c | 2 | ||||
| -rw-r--r-- | libavcodec/msrledec.c | 6 | ||||
| -rw-r--r-- | libavcodec/msrledec.h | 2 | ||||
| -rw-r--r-- | libavcodec/tscc.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index a91721e..6abf3b7 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -101,7 +101,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, switch (avctx->codec_tag) { case MKTAG('A', 'A', 'S', '4'): bytestream2_init(&s->gb, buf - 4, buf_size + 4); - ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; case MKTAG('A', 'A', 'S', 'C'): switch (compr) { @@ -117,7 +117,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, break; case 1: bytestream2_init(&s->gb, buf, buf_size); - ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; default: av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 3019d01..fa1d6a5 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -276,7 +276,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, p->linesize[0] = -p->linesize[0]; } bytestream2_init(&gb, buf, dsize); - ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb); + ff_msrle_decode(avctx, p, depth, &gb); if (height < 0) { p->data[0] += p->linesize[0] * (avctx->height - 1); p->linesize[0] = -p->linesize[0]; diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index df9f795..3090a91 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -135,7 +135,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, } } else { bytestream2_init(&s->gb, buf, buf_size); - ff_msrle_decode(avctx, (AVPicture*)s->frame, avctx->bits_per_coded_sample, &s->gb); + ff_msrle_decode(avctx, s->frame, avctx->bits_per_coded_sample, &s->gb); } if ((ret = av_frame_ref(data, s->frame)) < 0) diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index 3aa5e3c..805802a 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -30,7 +30,7 @@ #include "avcodec.h" #include "msrledec.h" -static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, +static int msrle_decode_pal4(AVCodecContext *avctx, AVFrame *pic, GetByteContext *gb) { unsigned char rle_code; @@ -126,7 +126,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, } -static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, +static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb) { uint8_t *output, *output_end; @@ -246,7 +246,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, } -int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, +int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb) { switch(depth){ diff --git a/libavcodec/msrledec.h b/libavcodec/msrledec.h index 3f66636..7f7bbcf 100644 --- a/libavcodec/msrledec.h +++ b/libavcodec/msrledec.h @@ -33,7 +33,7 @@ * @param depth bit depth * @param gb input bytestream context */ -int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, +int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic, int depth, GetByteContext *gb); #endif /* AVCODEC_MSRLEDEC_H */ diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 6b5e275..8c5ec68 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -94,7 +94,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (ret != Z_DATA_ERROR) { bytestream2_init(&c->gb, c->decomp_buf, c->decomp_size - c->zstream.avail_out); - ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb); + ff_msrle_decode(avctx, frame, c->bpp, &c->gb); } /* make the palette available on the way out */ |
