Silence some 'variable may be used uninitialized' compiler warnings

When compiling with -DG_DISABLE_ASSERT

diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c
index 99b6263..1c34fe0 100644 (file)
--- a/ext/wavpack/gstwavpackdec.c
+++ b/ext/wavpack/gstwavpackdec.c
@@ -209,6 +209,7 @@ gst_wavpack_dec_negotiate (GstWavpackDec * dec)
       dec->width = 32;
       break;
     default:
+      fmt = GST_AUDIO_FORMAT_UNKNOWN;
       g_assert_not_reached ();
       break;
   }

diff --git a/gst/rtpmanager/gstrtpssrcdemux.c b/gst/rtpmanager/gstrtpssrcdemux.c
index 3928e01..f933e81 100644 (file)
--- a/gst/rtpmanager/gstrtpssrcdemux.c
+++ b/gst/rtpmanager/gstrtpssrcdemux.c
@@ -241,6 +241,7 @@ find_or_create_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc,
         retpad = gst_object_ref (demuxpad->rtcp_pad);
         break;
       default:
+        retpad = NULL;
         g_assert_not_reached ();
     }
     GST_PAD_UNLOCK (demux);
@@ -310,6 +311,7 @@ find_or_create_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc,
       retpad = gst_object_ref (demuxpad->rtcp_pad);
       break;
     default:
+      retpad = NULL;
       g_assert_not_reached ();
   }
 

diff --git a/sys/oss4/oss4-audio.c b/sys/oss4/oss4-audio.c
index 89ab3d4..21a963f 100644 (file)
--- a/sys/oss4/oss4-audio.c
+++ b/sys/oss4/oss4-audio.c
@@ -282,7 +282,7 @@ gst_oss4_audio_set_ringbuffer_channel_layout (GstObject * obj, gint fd,
   } else if (GST_IS_OSS4_SOURCE (obj)) {
     rb = GST_AUDIO_BASE_SRC (obj)->ringbuffer;
   } else
-    g_assert_not_reached ();
+    g_return_if_reached ();
 
   /* -1 = get info for currently open device (fd). This will fail with
    * OSS build <= 1013 because of a bug in OSS */

diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 235c861..d040d9d 100644 (file)
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -218,8 +218,8 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
     }
     case GST_V4L2_IO_USERPTR:
     default:
+      newbuf = NULL;
       g_assert_not_reached ();
-      break;
   }
 
   pool->num_allocated++;
@@ -766,6 +766,7 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
 
         case GST_V4L2_IO_USERPTR:
         default:
+          ret = GST_FLOW_ERROR;
           g_assert_not_reached ();
           break;
       }
@@ -788,12 +789,14 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
 
         case GST_V4L2_IO_USERPTR:
         default:
+          ret = GST_FLOW_ERROR;
           g_assert_not_reached ();
           break;
       }
       break;
 
     default:
+      ret = GST_FLOW_ERROR;
       g_assert_not_reached ();
       break;
   }

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 2704f53..0ff2182 100644 (file)
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -1301,6 +1301,7 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc)
           break;
 #endif
         default:
+          format = GST_VIDEO_FORMAT_UNKNOWN;
           g_assert_not_reached ();
           break;
       }
@@ -1589,12 +1590,12 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l2Object * v4l2object,
   gint int_width = width;
   gint int_height = height;
 
-  if (!strcmp((char *)v4l2object->vcap.driver, "uvcvideo")) {
+  if (!strcmp ((char *) v4l2object->vcap.driver, "uvcvideo")) {
     /*
      * UVC devices are never interlaced, and doing VIDIOC_TRY_FMT on them
      * causes expensive and slow USB IO, so don't probe them for interlaced
      */
-     interlaced = FALSE;
+    interlaced = FALSE;
   } else {
     /* Interlaced detection using VIDIOC_TRY/S_FMT */
     if (!gst_v4l2_object_get_nearest_size (v4l2object, pixelformat,