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>
This commit is contained in:
parent
d0293c770b
commit
168565ce44
|
@ -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 },
|
{ "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
|
||||||
{ NULL },
|
{ 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_0(name_, long_name_, ext, codec, ...)
|
||||||
#define PCMDEF_1(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 = { \
|
const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
|
||||||
.name = #name_, \
|
.name = #name_, \
|
||||||
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
||||||
|
@ -118,7 +118,7 @@ const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
|
||||||
.flags = AVFMT_GENERIC_INDEX, \
|
.flags = AVFMT_GENERIC_INDEX, \
|
||||||
.extensions = ext, \
|
.extensions = ext, \
|
||||||
.raw_codec_id = codec, \
|
.raw_codec_id = codec, \
|
||||||
.priv_class = &name_ ## _demuxer_class, \
|
.priv_class = &pcm_demuxer_class, \
|
||||||
__VA_ARGS__ \
|
__VA_ARGS__ \
|
||||||
};
|
};
|
||||||
#define PCMDEF_2(name, long_name, ext, codec, enabled, ...) \
|
#define PCMDEF_2(name, long_name, ext, codec, enabled, ...) \
|
||||||
|
|
Loading…
Reference in New Issue