From 20f972701806be20a77f808db332d9489343bb78 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 16 Mar 2022 21:09:54 +0100 Subject: 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 Signed-off-by: Andreas Rheinhardt --- libavcodec/nellymoserdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavcodec/nellymoserdec.c') diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 52200ac92c..dfd96da80b 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -187,17 +187,17 @@ static av_cold int decode_end(AVCodecContext * avctx) { return 0; } -const AVCodec ff_nellymoser_decoder = { - .name = "nellymoser", - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_NELLYMOSER, +const FFCodec ff_nellymoser_decoder = { + .p.name = "nellymoser", + .p.long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserDecodeContext), .init = decode_init, .close = decode_end, .decode = decode_tag, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE | AV_CODEC_CAP_CHANNEL_CONF, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE | AV_CODEC_CAP_CHANNEL_CONF, + .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; -- cgit v1.2.3