avformat/rawdec: Deduplicate AVClasses based upon ff_raw_options

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 168565ce44
commit 6a055bf036
14 changed files with 27 additions and 57 deletions

View file

@ -56,7 +56,6 @@ static int mlp_probe(const AVProbeData *p)
return mlp_thd_probe(p, 0xf8726fbb);
}
FF_RAW_DEMUXER_CLASS(mlp)
const AVInputFormat ff_mlp_demuxer = {
.name = "mlp",
.long_name = NULL_IF_CONFIG_SMALL("raw MLP"),
@ -67,7 +66,7 @@ const AVInputFormat ff_mlp_demuxer = {
.extensions = "mlp",
.raw_codec_id = AV_CODEC_ID_MLP,
.priv_data_size = sizeof(FFRawDemuxerContext),
.priv_class = &mlp_demuxer_class,
.priv_class = &ff_raw_demuxer_class,
};
#endif
@ -77,7 +76,6 @@ static int thd_probe(const AVProbeData *p)
return mlp_thd_probe(p, 0xf8726fba);
}
FF_RAW_DEMUXER_CLASS(truehd)
const AVInputFormat ff_truehd_demuxer = {
.name = "truehd",
.long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"),
@ -88,7 +86,7 @@ const AVInputFormat ff_truehd_demuxer = {
.extensions = "thd",
.raw_codec_id = AV_CODEC_ID_TRUEHD,
.priv_data_size = sizeof(FFRawDemuxerContext),
.priv_class = &truehd_demuxer_class,
.priv_class = &ff_raw_demuxer_class,
};
#endif