Use av_{i,o}format_next instead of the private next field

This fixes compilation with MSVC where the initializer variables
are aliased to different names. Fixes bug #576126.

2 files changed, 4 insertions, 4 deletions

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 0fe5693..0aaf110 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1786,7 +1786,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
     (GInstanceInitFunc) gst_ffmpegdemux_init,
   };
 
-  in_plugin = first_iformat;
+  in_plugin = av_iformat_next (NULL);
 
   GST_LOG ("Registering demuxers");
 
@@ -1967,7 +1967,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
 
   next:
     g_free (name);
-    in_plugin = in_plugin->next;
+    in_plugin = av_iformat_next (in_plugin);
   }
 
   GST_LOG ("Finished registering demuxers");
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 7164fe0..55369a8 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -769,7 +769,7 @@ gst_ffmpegmux_register (GstPlugin * plugin)
   AVOutputFormat *in_plugin;
   GstFFMpegMuxClassParams *params;
 
-  in_plugin = first_oformat;
+  in_plugin = av_oformat_next (NULL);
 
   GST_LOG ("Registering muxers");
 
@@ -880,7 +880,7 @@ gst_ffmpegmux_register (GstPlugin * plugin)
     g_free (type_name);
 
   next:
-    in_plugin = in_plugin->next;
+    in_plugin = av_oformat_next (in_plugin);
   }
 
   GST_LOG ("Finished registering muxers");