3 files changed, 9 insertions, 10 deletions
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index e5ea2889..bd5014cc 100644
--- a/ext/raw1394/gstdv1394src.c
+++ b/ext/raw1394/gstdv1394src.c
@@ -1146,6 +1146,7 @@ gst_dv1394src_uri_get_type (void)
 {
   return GST_URI_SRC;
 }
+
 static gchar **
 gst_dv1394src_uri_get_protocols (void)
 {
@@ -1153,6 +1154,7 @@ gst_dv1394src_uri_get_protocols (void)
 
   return protocols;
 }
+
 static const gchar *
 gst_dv1394src_uri_get_uri (GstURIHandler * handler)
 {
@@ -1165,10 +1167,7 @@ static gboolean
 gst_dv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
 {
   gchar *protocol, *location;
-  gboolean ret;
-
-  ret = TRUE;
-
+  gboolean ret = TRUE;
   GstDV1394Src *gst_dv1394src = GST_DV1394SRC (handler);
 
   protocol = gst_uri_get_protocol (uri);
diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c
index 910e3c6c..e0beb53d 100644
--- a/ext/speex/gstspeexenc.c
+++ b/ext/speex/gstspeexenc.c
@@ -259,7 +259,7 @@ gst_speex_enc_sink_getcaps (GstPad * pad)
   if (peercaps) {
     if (!gst_caps_is_empty (peercaps) && !gst_caps_is_any (peercaps)) {
       GstStructure *ps = gst_caps_get_structure (peercaps, 0);
-      GstStructure *s = gst_caps_get_structure (caps, 0);;
+      GstStructure *s = gst_caps_get_structure (caps, 0);
       gint rate, channels;
 
       if (gst_structure_get_int (ps, "rate", &rate)) {
diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c
index 4b08c1a4..d941af67 100644
--- a/ext/wavpack/gstwavpackenc.c
+++ b/ext/wavpack/gstwavpackenc.c
@@ -475,13 +475,13 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * enc)
   /* Correction Mode, only in lossy mode */
   if (enc->wp_config->flags & CONFIG_HYBRID_FLAG) {
     if (enc->correction_mode > GST_WAVPACK_CORRECTION_MODE_OFF) {
+      GstCaps *caps = gst_caps_new_simple ("audio/x-wavpack-correction",
+          "framed", G_TYPE_BOOLEAN, TRUE, NULL);
+
       enc->wvcsrcpad =
           gst_pad_new_from_static_template (&wvcsrc_factory, "wvcsrc");
 
       /* try to add correction src pad, don't set correction mode on failure */
-      GstCaps *caps = gst_caps_new_simple ("audio/x-wavpack-correction",
-          "framed", G_TYPE_BOOLEAN, TRUE, NULL);
-
       GST_DEBUG_OBJECT (enc, "Adding correction pad with caps %"
           GST_PTR_FORMAT, caps);
       if (!gst_pad_set_caps (enc->wvcsrcpad, caps)) {
@@ -546,8 +546,8 @@ gst_wavpack_enc_push_block (void *id, void *data, int32_t count)
 
   pad = (wid->correction) ? enc->wvcsrcpad : enc->srcpad;
   flow =
-      (wid->correction) ? &enc->wvcsrcpad_last_return : &enc->
-      srcpad_last_return;
+      (wid->correction) ? &enc->
+      wvcsrcpad_last_return : &enc->srcpad_last_return;
 
   *flow = gst_pad_alloc_buffer_and_set_caps (pad, GST_BUFFER_OFFSET_NONE,
       count, GST_PAD_CAPS (pad), &buffer);