Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-03-30 22:33:24 +0300
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-04-05 20:54:09 +0300
commitce7dbd0481f990e249c2a05f179228489d3062cf (patch)
treec5f04e58129705430e1d97a5842131b72e250083 /libavcodec/jvdec.c
parentfb59a42ef977dd91085a602f10c9c82f88d072e5 (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/jvdec.c')
-rw-r--r--libavcodec/jvdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index 5849f4d1fd..805ff9dda5 100644
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@@ -144,8 +144,8 @@ static inline void decode8x8(GetBitContext *gb, uint8_t *dst, int linesize,
}
}
-static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt)
+static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
+ int *got_frame, AVPacket *avpkt)
{
JvContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data;
@@ -217,7 +217,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
s->palette_has_changed = 0;
memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
- if ((ret = av_frame_ref(data, s->frame)) < 0)
+ if ((ret = av_frame_ref(rframe, s->frame)) < 0)
return ret;
*got_frame = 1;
}