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/pcm-bluray.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/pcm-bluray.c')
| -rw-r--r-- | libavcodec/pcm-bluray.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 6250f25e72..9493b10ecd 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -27,6 +27,7 @@ #include "libavutil/channel_layout.h" #include "avcodec.h" #include "bytestream.h" +#include "codec_internal.h" #include "internal.h" /* @@ -299,14 +300,14 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, return retval + 4; } -const AVCodec ff_pcm_bluray_decoder = { - .name = "pcm_bluray", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_PCM_BLURAY, +const FFCodec ff_pcm_bluray_decoder = { + .p.name = "pcm_bluray", + .p.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_PCM_BLURAY, .decode = pcm_bluray_decode_frame, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .sample_fmts = (const enum AVSampleFormat[]){ + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, }; |