diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-30 22:33:24 +0300 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-05 20:54:09 +0300 |
| commit | ce7dbd0481f990e249c2a05f179228489d3062cf (patch) | |
| tree | c5f04e58129705430e1d97a5842131b72e250083 /libavcodec/scpr.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/scpr.c')
| -rw-r--r-- | libavcodec/scpr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 9e10c960b6..c744db2539 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -492,12 +492,11 @@ static int decompress_p(AVCodecContext *avctx, return 0; } -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) { SCPRContext *s = avctx->priv_data; GetByteContext *gb = &s->gb; - AVFrame *frame = data; int ret, type; if (avctx->bits_per_coded_sample == 16) { @@ -582,7 +581,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; if (avctx->bits_per_coded_sample != 16) { - ret = av_frame_ref(data, s->current_frame); + ret = av_frame_ref(frame, s->current_frame); if (ret < 0) return ret; } else { |