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 16:03:17 +0200 |
| commit | cd0ab3526dcb6dbad906af0f65296c14898f6b19 (patch) | |
| tree | 33a3d4bd860ea89c654efc1aaf171735f852fac9 | |
| parent | e4ee2a0629e322d1c0bc23bbf3e65c43b06abe56 (diff) | |
| download | ffmpeg-cd0ab3526dcb6dbad906af0f65296c14898f6b19.tar.gz | |
avformat/g726: Deduplicate AVClasses
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>
| -rw-r--r-- | libavformat/g726.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libavformat/g726.c b/libavformat/g726.c index 01d92e1d6d..4b08d0a9f7 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -65,33 +65,26 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_G726_DEMUXER -static const AVClass g726le_demuxer_class = { - .class_name = "G.726 big-endian demuxer", +static const AVClass g726_demuxer_class = { + .class_name = "G.726 demuxer", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_G726_DEMUXER const AVInputFormat ff_g726_demuxer = { .name = "g726", .long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left aligned\")"), .read_header = g726_read_header, .read_packet = g726_read_packet, .priv_data_size = sizeof(G726Context), - .priv_class = &g726le_demuxer_class, + .priv_class = &g726_demuxer_class, .raw_codec_id = AV_CODEC_ID_ADPCM_G726, }; #endif #if CONFIG_G726LE_DEMUXER -static const AVClass g726_demuxer_class = { - .class_name = "G.726 little-endian demuxer", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVInputFormat ff_g726le_demuxer = { .name = "g726le", .long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right aligned\")"), |