From 6a055bf03612a67280e1188b269d2fa6cb08d3e7 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 7 Jun 2021 16:13:33 +0200 Subject: 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 --- libavformat/mlpdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavformat/mlpdec.c') diff --git a/libavformat/mlpdec.c b/libavformat/mlpdec.c index 6f2ba5d874..8f0aabb510 100644 --- a/libavformat/mlpdec.c +++ b/libavformat/mlpdec.c @@ -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 -- cgit v1.2.3