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/libgsmenc.c | |
| parent | a688f3c13ce55c2ba51dbbb344564649f1bb52fe (diff) | |
| download | ffmpeg-20f972701806be20a77f808db332d9489343bb78.tar.gz | |
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/libgsmenc.c')
| -rw-r--r-- | libavcodec/libgsmenc.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index 90aaecc2f8..d172bae11e 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -117,42 +117,42 @@ static const AVCodecDefault libgsm_defaults[] = { }; #if CONFIG_LIBGSM_ENCODER -const AVCodec ff_libgsm_encoder = { - .name = "libgsm", - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_GSM, - .capabilities = AV_CODEC_CAP_DR1, +const FFCodec ff_libgsm_encoder = { + .p.name = "libgsm", + .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_GSM, + .p.capabilities = AV_CODEC_CAP_DR1, .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, .defaults = libgsm_defaults, #if FF_API_OLD_CHANNEL_LAYOUT - .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, + .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, #endif - .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .wrapper_name = "libgsm", + .p.wrapper_name = "libgsm", }; #endif #if CONFIG_LIBGSM_MS_ENCODER -const AVCodec ff_libgsm_ms_encoder = { - .name = "libgsm_ms", - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_GSM_MS, - .capabilities = AV_CODEC_CAP_DR1, +const FFCodec ff_libgsm_ms_encoder = { + .p.name = "libgsm_ms", + .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_GSM_MS, + .p.capabilities = AV_CODEC_CAP_DR1, .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, .defaults = libgsm_defaults, #if FF_API_OLD_CHANNEL_LAYOUT - .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, + .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, #endif - .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .wrapper_name = "libgsm", + .p.wrapper_name = "libgsm", }; #endif |