diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-16 21:09:54 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-21 01:33:09 +0100 |
| commit | 20f972701806be20a77f808db332d9489343bb78 (patch) | |
| tree | 8d8b588c0ca06fa652518a5685db8280b0bf532d /libavcodec/srtenc.c | |
| parent | a688f3c13ce55c2ba51dbbb344564649f1bb52fe (diff) | |
avcodec/codec_internal: Add FFCodec, hide internal part of AVCodec
Up until now, codec.h contains both public and private parts
of AVCodec. This exposes the internals of AVCodec to users
and leads them into the temptation of actually using them
and forces us to forward-declare structures and types that
users can't use at all.
This commit changes this by adding a new structure FFCodec to
codec_internal.h that extends AVCodec, i.e. contains the public
AVCodec as first member; the private fields of AVCodec are moved
to this structure, leaving codec.h clean.
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/srtenc.c')
| -rw-r--r-- | libavcodec/srtenc.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 7864ea3386..8ff799b684 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -293,11 +293,11 @@ static int srt_encode_close(AVCodecContext *avctx) #if CONFIG_SRT_ENCODER /* deprecated encoder */ -const AVCodec ff_srt_encoder = { - .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), - .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_SUBRIP, +const FFCodec ff_srt_encoder = { + .p.name = "srt", + .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .p.type = AVMEDIA_TYPE_SUBTITLE, + .p.id = AV_CODEC_ID_SUBRIP, .priv_data_size = sizeof(SRTContext), .init = srt_encode_init, .encode_sub = srt_encode_frame, @@ -307,11 +307,11 @@ const AVCodec ff_srt_encoder = { #endif #if CONFIG_SUBRIP_ENCODER -const AVCodec ff_subrip_encoder = { - .name = "subrip", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), - .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_SUBRIP, +const FFCodec ff_subrip_encoder = { + .p.name = "subrip", + .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .p.type = AVMEDIA_TYPE_SUBTITLE, + .p.id = AV_CODEC_ID_SUBRIP, .priv_data_size = sizeof(SRTContext), .init = srt_encode_init, .encode_sub = srt_encode_frame, @@ -321,11 +321,11 @@ const AVCodec ff_subrip_encoder = { #endif #if CONFIG_TEXT_ENCODER -const AVCodec ff_text_encoder = { - .name = "text", - .long_name = NULL_IF_CONFIG_SMALL("Raw text subtitle"), - .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_TEXT, +const FFCodec ff_text_encoder = { + .p.name = "text", + .p.long_name = NULL_IF_CONFIG_SMALL("Raw text subtitle"), + .p.type = AVMEDIA_TYPE_SUBTITLE, + .p.id = AV_CODEC_ID_TEXT, .priv_data_size = sizeof(SRTContext), .init = srt_encode_init, .encode_sub = text_encode_frame, |