aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/samidec.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-03-30 19:52:41 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-04-05 19:53:27 +0200
commitfb59a42ef977dd91085a602f10c9c82f88d072e5 (patch)
treee65c7b1e66eb0b07dbe51124e88fb3b918129b6f /libavcodec/samidec.c
parent1c3c29d07d7e0b7f5bec13cb0214f90e26604aee (diff)
downloadffmpeg-fb59a42ef977dd91085a602f10c9c82f88d072e5.tar.gz
avcodec/codec_internal: Add FFCodec.decode_sub
This increases type-safety by avoiding conversions from/through void*. It also avoids the boilerplate "AVSubtitle *sub = data;" line for subtitle decoders. Its only downside is that it increases sizeof(FFCodec), yet this can be more than offset lateron. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/samidec.c')
-rw-r--r--libavcodec/samidec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 2c8c31e4f6..f2cf5783af 100644
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -132,10 +132,9 @@ end:
return ret;
}
-static int sami_decode_frame(AVCodecContext *avctx,
- void *data, int *got_sub_ptr, AVPacket *avpkt)
+static int sami_decode_frame(AVCodecContext *avctx, AVSubtitle *sub,
+ int *got_sub_ptr, AVPacket *avpkt)
{
- AVSubtitle *sub = data;
const char *ptr = avpkt->data;
SAMIContext *sami = avctx->priv_data;
@@ -189,7 +188,7 @@ const FFCodec ff_sami_decoder = {
.priv_data_size = sizeof(SAMIContext),
.init = sami_init,
.close = sami_close,
- .decode = sami_decode_frame,
+ .decode_sub = sami_decode_frame,
.flush = sami_flush,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};