highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/adpcmenc: Deduplicate AVClasses

Browse Source 
The child_class_next API relied on different (de)muxers to use
different AVClasses; yet this API has been replaced by
child_class_iterate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-06-07 16:13:33 +02:00
parent 63f736f476
commit 62e3d01cc7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/adpcmenc.c
View File

@@ -982,14 +982,14 @@ static const AVOption options[] = {
{ NULL } { NULL }
}; };
static const AVClass adpcm_encoder_class = {
.class_name = "ADPCM encoder",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
#define ADPCM_ENCODER(id_, name_, sample_fmts_, capabilities_, long_name_) \ #define ADPCM_ENCODER(id_, name_, sample_fmts_, capabilities_, long_name_) \
static const AVClass name_ ## _encoder_class = { \
.class_name = #name_, \
.item_name = av_default_item_name, \
.option = options, \
.version = LIBAVUTIL_VERSION_INT, \
}; \
\
const AVCodec ff_ ## name_ ## _encoder = { \ const AVCodec ff_ ## name_ ## _encoder = { \
.name = #name_, \ .name = #name_, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
@@ -1002,7 +1002,7 @@ const AVCodec ff_ ## name_ ## _encoder = { \
.sample_fmts = sample_fmts_, \ .sample_fmts = sample_fmts_, \
.capabilities = capabilities_ | AV_CODEC_CAP_DR1, \ .capabilities = capabilities_ | AV_CODEC_CAP_DR1, \
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, \
.priv_class = &name_ ## _encoder_class, \ .priv_class = &adpcm_encoder_class, \
} }
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games");