av_oformat_next (deprecated) -> av_muxer_iterate

https://bugzilla.gnome.org/show_bug.cgi?id=792900
This commit is contained in:
Mathieu Duponchelle 2018-06-29 21:38:50 +02:00
parent bc7160dd47
commit 2ec542f7c2

View file

@ -876,13 +876,12 @@ gst_ffmpegmux_register (GstPlugin * plugin)
NULL, NULL, NULL NULL, NULL, NULL
}; };
GType type; GType type;
AVOutputFormat *in_plugin; const AVOutputFormat *in_plugin;
void *i = 0;
in_plugin = av_oformat_next (NULL);
GST_LOG ("Registering muxers"); GST_LOG ("Registering muxers");
while (in_plugin) { while ((in_plugin = av_muxer_iterate (&i))) {
gchar *type_name; gchar *type_name;
GstRank rank = GST_RANK_MARGINAL; GstRank rank = GST_RANK_MARGINAL;
@ -921,12 +920,12 @@ gst_ffmpegmux_register (GstPlugin * plugin)
!strncmp (in_plugin->name, "webm", 4) !strncmp (in_plugin->name, "webm", 4)
) { ) {
GST_LOG ("Ignoring muxer %s", in_plugin->name); GST_LOG ("Ignoring muxer %s", in_plugin->name);
goto next; continue;
} }
if ((!strncmp (in_plugin->long_name, "raw ", 4))) { if ((!strncmp (in_plugin->long_name, "raw ", 4))) {
GST_LOG ("Ignoring raw muxer %s", in_plugin->name); GST_LOG ("Ignoring raw muxer %s", in_plugin->name);
goto next; continue;
} }
if (gst_ffmpegmux_get_replacement (in_plugin->name)) if (gst_ffmpegmux_get_replacement (in_plugin->name))
@ -954,9 +953,6 @@ gst_ffmpegmux_register (GstPlugin * plugin)
} }
g_free (type_name); g_free (type_name);
next:
in_plugin = av_oformat_next (in_plugin);
} }
GST_LOG ("Finished registering muxers"); GST_LOG ("Finished registering muxers");