diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-30 21:33:24 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-05 19:54:09 +0200 |
commit | ce7dbd0481f990e249c2a05f179228489d3062cf (patch) | |
tree | c5f04e58129705430e1d97a5842131b72e250083 /libavcodec/bintext.c | |
parent | fb59a42ef977dd91085a602f10c9c82f88d072e5 (diff) |
avcodec/codec_internal: Make FFCodec.decode use AVFrame*
This increases type-safety by avoiding conversions from/through void*.
It also avoids the boilerplate "AVFrame *frame = data;" line
for non-subtitle decoders.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/bintext.c')
-rw-r--r-- | libavcodec/bintext.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index 0fad8305f8..183fea5b84 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -140,9 +140,8 @@ static void draw_char(AVCodecContext *avctx, int c, int a) } } -static int decode_frame(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, AVFrame *frame, + int *got_frame, AVPacket *avpkt) { XbinContext *s = avctx->priv_data; const uint8_t *buf = avpkt->data; @@ -153,7 +152,7 @@ static int decode_frame(AVCodecContext *avctx, if ((avctx->width / FONT_WIDTH) * (avctx->height / s->font_height) / 256 > buf_size) return AVERROR_INVALIDDATA; - s->frame = data; + s->frame = frame; s->x = s->y = 0; if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) return ret; |