Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / ext / libswscale / gstffmpegscale.c

diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
index efaa922..6d75d9a 100644 (file)
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@ -779,4 +779,10 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     "ffvideoscale",
     "videoscaling element (" FFMPEG_SOURCE ")",
     plugin_init,
-    PACKAGE_VERSION, "GPL", "FFMpeg", "http://ffmpeg.sourceforge.net/")
+    PACKAGE_VERSION,
+#ifdef GST_FFMPEG_ENABLE_LGPL
+    "LGPL",
+#else
+    "GPL",
+#endif
+    "FFMpeg", "http://ffmpeg.sourceforge.net/")