Merge remote-tracking branch 'origin/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 88a43bc..7fb9901 100644 (file)
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -148,8 +148,8 @@ plugin_init (GstPlugin * plugin)
 #endif
 #if 0
   gst_ffmpegcsp_register (plugin);
-#endif
   gst_ffmpegaudioresample_register (plugin);
+#endif
 
   av_register_protocol2 (&gstreamer_protocol, sizeof (URLProtocol));
   av_register_protocol2 (&gstpipe_protocol, sizeof (URLProtocol));