From 267446a6e04437f16e56731e99d54625063a11d6 Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Thu, 3 Dec 2015 17:52:03 +0900 Subject: [PATCH] Fix svace defects Change-Id: Ibc6aec1fd85e3d4d539f8e5fa207b39c73740b3b --- gst/rtsp-server/rtsp-client-wfd.c | 12 ++++++------ gst/rtsp-server/rtsp-media-factory-wfd.c | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gst/rtsp-server/rtsp-client-wfd.c b/gst/rtsp-server/rtsp-client-wfd.c index 561a722..38cbae1 100644 --- a/gst/rtsp-server/rtsp-client-wfd.c +++ b/gst/rtsp-server/rtsp-client-wfd.c @@ -2717,7 +2717,7 @@ void gst_rtsp_wfd_client_set_audio_freq(GstRTSPWFDClient *client, guint freq) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); priv->cFreq = freq; } @@ -2726,7 +2726,7 @@ void gst_rtsp_wfd_client_set_edid_supported(GstRTSPWFDClient *client, gboolean supported) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); priv->edid_supported = supported; } @@ -2735,7 +2735,7 @@ void gst_rtsp_wfd_client_set_edid_hresolution(GstRTSPWFDClient *client, guint32 reso) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); priv->edid_hres = reso; } @@ -2744,7 +2744,7 @@ void gst_rtsp_wfd_client_set_edid_vresolution(GstRTSPWFDClient *client, guint32 reso) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); priv->edid_vres = reso; } @@ -2753,7 +2753,7 @@ void gst_rtsp_wfd_client_set_protection_enabled(GstRTSPWFDClient *client, gboolean enable) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); priv->protection_enabled = enable; } @@ -2761,7 +2761,7 @@ gst_rtsp_wfd_client_set_protection_enabled(GstRTSPWFDClient *client, gboolean en void gst_rtsp_wfd_client_set_keep_alive_flag(GstRTSPWFDClient *client, gboolean flag) { GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client); - g_return_val_if_fail (priv != NULL, 0); + g_return_if_fail (priv != NULL); g_mutex_lock(&priv->keep_alive_lock); if (priv->keep_alive_flag == !(flag)) diff --git a/gst/rtsp-server/rtsp-media-factory-wfd.c b/gst/rtsp-server/rtsp-media-factory-wfd.c index f08a5c2..0b7e76d 100644 --- a/gst/rtsp-server/rtsp-media-factory-wfd.c +++ b/gst/rtsp-server/rtsp-media-factory-wfd.c @@ -740,11 +740,12 @@ _rtsp_media_factory_wfd_create_camera_capture_bin (GstRTSPMediaFactoryWFD * } venc = gst_element_factory_make (vcodec, "videoenc"); + if (vcodec) g_free (vcodec); + if (!venc) { GST_ERROR_OBJECT (factory, "failed to create video encoder element"); goto create_error; } - if (vcodec) g_free (vcodec); g_object_set (venc, "bitrate", priv->video_bitrate, NULL); g_object_set (venc, "byte-stream", 1, NULL); -- 2.7.4