[Spice-commits] server/reds.c

[Frediano Ziglio]

 server/reds.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 99eff8500bab5a3b3f1c8aca0ac12bd0856dde5e
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Tue Nov 15 18:27:06 2016 +0100

    Do not use gstreamer in default codecs if not available
    
    Avoid the following warning when build with disabled gstreamer:
    Spice-WARNING **: reds.c:3660:reds_set_video_codecs: spice: unsupported video encoder gstreamer
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/reds.c b/server/reds.c
index 1a58c9d..12a274c 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3507,7 +3507,12 @@ err:
 }
 
 static const char default_renderer[] = "sw";
-static const char default_video_codecs[] = "spice:mjpeg;gstreamer:mjpeg;gstreamer:h264;gstreamer:vp8";
+#if defined(HAVE_GSTREAMER_1_0) || defined(HAVE_GSTREAMER_0_10)
+#define GSTREAMER_CODECS "gstreamer:mjpeg;gstreamer:h264;gstreamer:vp8;"
+#else
+#define GSTREAMER_CODECS ""
+#endif
+static const char default_video_codecs[] = "spice:mjpeg;" GSTREAMER_CODECS;
 
 /* new interface */
 SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void)