diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-30 19:52:41 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-05 19:53:27 +0200 |
| commit | fb59a42ef977dd91085a602f10c9c82f88d072e5 (patch) | |
| tree | e65c7b1e66eb0b07dbe51124e88fb3b918129b6f /libavcodec/microdvddec.c | |
| parent | 1c3c29d07d7e0b7f5bec13cb0214f90e26604aee (diff) | |
| download | ffmpeg-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/microdvddec.c')
| -rw-r--r-- | libavcodec/microdvddec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c index 0863fe1494..1cd5d1d5f5 100644 --- a/libavcodec/microdvddec.c +++ b/libavcodec/microdvddec.c @@ -274,10 +274,9 @@ static void microdvd_close_no_persistent_tags(AVBPrint *new_line, } } -static int microdvd_decode_frame(AVCodecContext *avctx, - void *data, int *got_sub_ptr, AVPacket *avpkt) +static int microdvd_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, + int *got_sub_ptr, AVPacket *avpkt) { - AVSubtitle *sub = data; AVBPrint new_line; char *line = avpkt->data; char *end = avpkt->data + avpkt->size; @@ -375,7 +374,7 @@ const FFCodec ff_microdvd_decoder = { .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_MICRODVD, .init = microdvd_init, - .decode = microdvd_decode_frame, + .decode_sub = microdvd_decode_frame, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, |