Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / ext / ffmpeg / gstffmpeg.c

diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c
index a69bf49..d131e1b 100644 (file)
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -151,8 +151,8 @@ plugin_init (GstPlugin * plugin)
   gst_ffmpegaudioresample_register (plugin);
 #endif
 
-  register_protocol (&gstreamer_protocol);
-  register_protocol (&gstpipe_protocol);
+  av_register_protocol2 (&gstreamer_protocol, sizeof (URLProtocol));
+  av_register_protocol2 (&gstpipe_protocol, sizeof (URLProtocol));
 
   /* Now we can return the pointer to the newly created Plugin object. */
   return TRUE;