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/eac3enc.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/eac3enc.c')
| -rw-r--r-- | libavcodec/eac3enc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 5964eeee5a..5c19d70266 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -250,24 +250,24 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s) FF_DISABLE_DEPRECATION_WARNINGS -const AVCodec ff_eac3_encoder = { - .name = "eac3", - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_EAC3, - .capabilities = AV_CODEC_CAP_DR1, +const FFCodec ff_eac3_encoder = { + .p.name = "eac3", + .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_EAC3, + .p.capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(AC3EncodeContext), .init = ff_ac3_float_encode_init, .encode2 = ff_ac3_float_encode_frame, .close = ff_ac3_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .priv_class = &eac3enc_class, - .supported_samplerates = ff_ac3_sample_rate_tab, + .p.priv_class = &eac3enc_class, + .p.supported_samplerates = ff_ac3_sample_rate_tab, #if FF_API_OLD_CHANNEL_LAYOUT - .channel_layouts = ff_ac3_channel_layouts, + .p.channel_layouts = ff_ac3_channel_layouts, #endif - .ch_layouts = ff_ac3_ch_layouts, + .p.ch_layouts = ff_ac3_ch_layouts, .defaults = ff_ac3_enc_defaults, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; |