From d1c7f2e4d1c0c7e880315b69fee9bb802d0b3772 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 26 Sep 2014 13:46:16 +0300 Subject: [PATCH] rtspsrc: Fix compiler warnings gstrtspsrc.c:7939:11: error: implicit conversion from enumeration type 'GstSDPResult' to different enumeration type 'GstRTSPResult' [-Werror,-Wenum-conversion] res = gst_sdp_message_new (&sdp); ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~ gstrtspsrc.c:7944:11: error: implicit conversion from enumeration type 'GstSDPResult' to different enumeration type 'GstRTSPResult' [-Werror,-Wenum-conversion] res = gst_sdp_message_parse_uri (uri, sdp); ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- gst/rtsp/gstrtspsrc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 6e05cc5..6929cd1 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -7926,6 +7926,7 @@ gst_rtspsrc_uri_set_uri (GstURIHandler * handler, const gchar * uri, { GstRTSPSrc *src; GstRTSPResult res; + GstSDPResult sres; GstRTSPUrl *newurl = NULL; GstSDPMessage *sdp = NULL; @@ -7936,13 +7937,13 @@ gst_rtspsrc_uri_set_uri (GstURIHandler * handler, const gchar * uri, goto was_ok; if (g_str_has_prefix (uri, "rtsp-sdp://")) { - res = gst_sdp_message_new (&sdp); - if (res < 0) + sres = gst_sdp_message_new (&sdp); + if (sres < 0) goto sdp_failed; GST_DEBUG_OBJECT (src, "parsing SDP message"); - res = gst_sdp_message_parse_uri (uri, sdp); - if (res < 0) + sres = gst_sdp_message_parse_uri (uri, sdp); + if (sres < 0) goto invalid_sdp; } else { /* try to parse */ @@ -7983,14 +7984,14 @@ was_ok: } sdp_failed: { - GST_ERROR_OBJECT (src, "Could not create new SDP (%d)", res); + GST_ERROR_OBJECT (src, "Could not create new SDP (%d)", sres); g_set_error_literal (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Could not create SDP"); return FALSE; } invalid_sdp: { - GST_ERROR_OBJECT (src, "Not a valid SDP (%d) '%s'", res, + GST_ERROR_OBJECT (src, "Not a valid SDP (%d) '%s'", sres, GST_STR_NULL (uri)); gst_sdp_message_free (sdp); g_set_error_literal (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, -- 2.7.4