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/wrapped_avframe.c | |
parent | fb59a42ef977dd91085a602f10c9c82f88d072e5 (diff) | |
download | ffmpeg-ce7dbd0481f990e249c2a05f179228489d3062cf.tar.gz |
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/wrapped_avframe.c')
-rw-r--r-- | libavcodec/wrapped_avframe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index 291f4d5d31..6794dd2045 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -76,10 +76,10 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static int wrapped_avframe_decode(AVCodecContext *avctx, void *data, +static int wrapped_avframe_decode(AVCodecContext *avctx, AVFrame *out, int *got_frame, AVPacket *pkt) { - AVFrame *in, *out; + AVFrame *in; int err; if (!(pkt->flags & AV_PKT_FLAG_TRUSTED)) { @@ -91,7 +91,6 @@ static int wrapped_avframe_decode(AVCodecContext *avctx, void *data, return AVERROR(EINVAL); in = (AVFrame*)pkt->data; - out = data; err = ff_decode_frame_props(avctx, out); if (err < 0) |