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:18 +0200 |
| commit | 168565ce44308451a50b3ece731727988e0f2389 (patch) | |
| tree | bd435a19134189bfa9e55ca83d89d60523a46da5 | |
| parent | d0293c770bbc747ba8eaa310f7b3632207a36ebd (diff) | |
| download | ffmpeg-168565ce44308451a50b3ece731727988e0f2389.tar.gz | |
avformat/pcmdec: 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/pcmdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 01447c2b7e..63539a47c0 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -99,15 +99,15 @@ static const AVOption pcm_options[] = { { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; +static const AVClass pcm_demuxer_class = { + .class_name = "pcm demuxer", + .item_name = av_default_item_name, + .option = pcm_options, + .version = LIBAVUTIL_VERSION_INT, +}; #define PCMDEF_0(name_, long_name_, ext, codec, ...) #define PCMDEF_1(name_, long_name_, ext, codec, ...) \ -static const AVClass name_ ## _demuxer_class = { \ - .class_name = #name_ " demuxer", \ - .item_name = av_default_item_name, \ - .option = pcm_options, \ - .version = LIBAVUTIL_VERSION_INT, \ -}; \ const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .name = #name_, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ @@ -118,7 +118,7 @@ const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .flags = AVFMT_GENERIC_INDEX, \ .extensions = ext, \ .raw_codec_id = codec, \ - .priv_class = &name_ ## _demuxer_class, \ + .priv_class = &pcm_demuxer_class, \ __VA_ARGS__ \ }; #define PCMDEF_2(name, long_name, ext, codec, enabled, ...) \ |