summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/avi/gstavisubtitle.c4
-rw-r--r--gst/rtsp/gstrtspsrc.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/gst/avi/gstavisubtitle.c b/gst/avi/gstavisubtitle.c
index 6fdf5fea..4b498b35 100644
--- a/gst/avi/gstavisubtitle.c
+++ b/gst/avi/gstavisubtitle.c
@@ -78,7 +78,7 @@ gst_avi_subtitle_extract_file (GstAviSubtitle * sub, GstBuffer * buffer,
guint offset, guint len)
{
const gchar *input_enc = NULL;
- GstBuffer *ret;
+ GstBuffer *ret = NULL;
gchar *data;
data = (gchar *) GST_BUFFER_DATA (buffer) + offset;
@@ -111,6 +111,8 @@ gst_avi_subtitle_extract_file (GstAviSubtitle * sub, GstBuffer * buffer,
return NULL;
}
+ g_return_val_if_fail (ret != NULL || input_enc != NULL, NULL);
+
if (input_enc) {
GError *err = NULL;
gchar *utf8;
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 50ce4afe..2f02c361 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -3215,10 +3215,10 @@ gst_rtspsrc_send (GstRTSPSrc * src, GstRTSPMessage * request,
GstRTSPMessage * response, GstRTSPStatusCode * code)
{
GstRTSPStatusCode int_code = GST_RTSP_STS_OK;
- GstRTSPResult res;
+ GstRTSPResult res = GST_RTSP_ERROR;
gint count;
gboolean retry;
- GstRTSPMethod method;
+ GstRTSPMethod method = GST_RTSP_INVALID;
count = 0;
do {