diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-14 12:33:18 +0300 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-21 12:51:07 +0300 |
commit | 3496cec43304ac040d6d05f9d500a6f93cc049e7 (patch) | |
tree | b71dbc023a212e2b5c640ae2a1d25ade9d690047 /libavcodec | |
parent | ac981d16415e7fd99683e10297781c7d9ec1a8cd (diff) |
msrle: Use AVFrame instead of AVPicture
Callers always use a frame and cast it to AVPicture, change
ff_msrle_decode() to accept an AVFrame directly instead.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/aasc.c | 2 | ||||
-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, 8 insertions, 8 deletions
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 462ee67786..9e70314964 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -85,7 +85,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 f545e784b8..648fa68e1f 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -264,7 +264,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 a1adeba949..e262f92c41 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -126,7 +126,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 370d9bdfce..f45179f26e 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; @@ -128,7 +128,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; @@ -243,7 +243,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 a594de37be..0c5b8b1c57 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 98b5f7161b..c96a577a81 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -95,7 +95,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 */ |