diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-06-07 16:13:33 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-08 19:30:36 +0200 |
| commit | 9a1a82d21c8a6145b9a9428eb6dabd1d28fcb626 (patch) | |
| tree | 7812875f5d29bf4669d6e525ebbef3b85aa89daa | |
| parent | 34a7e6176867389961a07f754cbdd39fe97689f9 (diff) | |
| download | ffmpeg-9a1a82d21c8a6145b9a9428eb6dabd1d28fcb626.tar.gz | |
avcodec/ac3dec_float: Deduplicate AVClasses
The child_class_next API relied on different AVCodecs to use
different AVClasses; yet this API has been replaced by
child_class_iterate.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/ac3dec_float.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 3aa6482b1a..573fbe75b6 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -46,8 +46,8 @@ static const AVOption options[] = { { NULL}, }; -static const AVClass ac3_decoder_class = { - .class_name = "AC3 decoder", +static const AVClass ac3_eac3_decoder_class = { + .class_name = "(E-)AC3 decoder", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -66,18 +66,11 @@ const AVCodec ff_ac3_decoder = { .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .priv_class = &ac3_decoder_class, + .priv_class = &ac3_eac3_decoder_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_EAC3_DECODER -static const AVClass eac3_decoder_class = { - .class_name = "E-AC3 decoder", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVCodec ff_eac3_decoder = { .name = "eac3", .type = AVMEDIA_TYPE_AUDIO, @@ -91,7 +84,7 @@ const AVCodec ff_eac3_decoder = { .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .priv_class = &eac3_decoder_class, + .priv_class = &ac3_eac3_decoder_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif |