diff --git a/subprojects/gst-libav/docs/gst_plugins_cache.json b/subprojects/gst-libav/docs/gst_plugins_cache.json index 5ccd9a6bf1..1ba73f0c58 100644 --- a/subprojects/gst-libav/docs/gst_plugins_cache.json +++ b/subprojects/gst-libav/docs/gst_plugins_cache.json @@ -14281,7 +14281,7 @@ } }, "properties": {}, - "rank": "marginal" + "rank": "primary" }, "avdec_mpc8": { "author": "Wim Taymans , Ronald Bultje , Edward Hervey ", @@ -14309,7 +14309,7 @@ } }, "properties": {}, - "rank": "marginal" + "rank": "primary" }, "avdec_mpeg2video": { "author": "Wim Taymans , Ronald Bultje , Edward Hervey ", @@ -27614,7 +27614,7 @@ "presence": "sometimes" } }, - "rank": "marginal", + "rank": "secondary", "signals": {} }, "avdemux_mpc8": { @@ -27646,7 +27646,7 @@ "presence": "sometimes" } }, - "rank": "marginal", + "rank": "secondary", "signals": {} }, "avdemux_mxf": { diff --git a/subprojects/gst-libav/ext/libav/gstavauddec.c b/subprojects/gst-libav/ext/libav/gstavauddec.c index 597cb547bc..a571d4ec08 100644 --- a/subprojects/gst-libav/ext/libav/gstavauddec.c +++ b/subprojects/gst-libav/ext/libav/gstavauddec.c @@ -943,6 +943,8 @@ gst_ffmpegauddec_register (GstPlugin * plugin) case AV_CODEC_ID_RA_288: case AV_CODEC_ID_COOK: case AV_CODEC_ID_AAC: + case AV_CODEC_ID_MUSEPACK7: + case AV_CODEC_ID_MUSEPACK8: rank = GST_RANK_PRIMARY; break; /* SIPR: decoder should have a higher rank than realaudiodec. diff --git a/subprojects/gst-libav/ext/libav/gstavdemux.c b/subprojects/gst-libav/ext/libav/gstavdemux.c index aaa9265ec6..e241fb19f0 100644 --- a/subprojects/gst-libav/ext/libav/gstavdemux.c +++ b/subprojects/gst-libav/ext/libav/gstavdemux.c @@ -2146,15 +2146,16 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "4xm") || !strcmp (in_plugin->name, "yuv4mpegpipe") || !strcmp (in_plugin->name, "pva") || - !strcmp (in_plugin->name, "mpc") || - !strcmp (in_plugin->name, "mpc8") || !strcmp (in_plugin->name, "ivf") || !strcmp (in_plugin->name, "brstm") || !strcmp (in_plugin->name, "bfstm") || !strcmp (in_plugin->name, "gif") || - !strcmp (in_plugin->name, "dsf") || !strcmp (in_plugin->name, "iff")) + !strcmp (in_plugin->name, "dsf") || !strcmp (in_plugin->name, "iff")) { rank = GST_RANK_MARGINAL; - else { + } else if (!strcmp (in_plugin->name, "mpc") || + !strcmp (in_plugin->name, "mpc8")) { + rank = GST_RANK_SECONDARY; + } else { GST_DEBUG ("ignoring %s", in_plugin->name); rank = GST_RANK_NONE; continue; diff --git a/subprojects/gst-plugins-bad/ext/musepack/gstmusepackdec.c b/subprojects/gst-plugins-bad/ext/musepack/gstmusepackdec.c index cf7a08e512..7ee2fe995e 100644 --- a/subprojects/gst-plugins-bad/ext/musepack/gstmusepackdec.c +++ b/subprojects/gst-plugins-bad/ext/musepack/gstmusepackdec.c @@ -79,7 +79,7 @@ G_DEFINE_TYPE_WITH_CODE (GstMusepackDec, gst_musepackdec, GST_TYPE_ELEMENT, "mpc decoder"); ); GST_ELEMENT_REGISTER_DEFINE (musepackdec, "musepackdec", - GST_RANK_PRIMARY, GST_TYPE_MUSEPACK_DEC); + GST_RANK_MARGINAL, GST_TYPE_MUSEPACK_DEC); static void gst_musepackdec_class_init (GstMusepackDecClass * klass) { diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c index e5f0275b82..7e85b14ad0 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c @@ -152,6 +152,7 @@ static const FormatInfo formats[] = { {"audio/x-mod", "Module Music Format (MOD)", FLAG_AUDIO, "mod"}, {"audio/x-mulaw", "Mu-Law", FLAG_AUDIO, ""}, {"audio/x-musepack", "Musepack (MPC)", FLAG_AUDIO, "mpc"}, + {"audio/x-ffmpeg-parsed-musepack", "Musepack (MPC)", FLAG_AUDIO, "mpc"}, {"audio/x-nellymoser", "Nellymoser Asao", FLAG_AUDIO, ""}, {"audio/x-nist", "Sphere NIST", FLAG_AUDIO, ""}, {"audio/x-nsf", "Nintendo NSF", FLAG_AUDIO, ""},