Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / subparse / gstsubparse.c

diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index b4bbb5f..c910cb2 100644 (file)
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -227,6 +227,7 @@ gst_sub_parse_src_query (GstPad * pad, GstQuery * query)
         ret = TRUE;
         gst_query_set_position (query, GST_FORMAT_TIME, self->segment.position);
       }
+      break;
     }
     case GST_QUERY_SEEKING:
     {
@@ -246,7 +247,6 @@ gst_sub_parse_src_query (GstPad * pad, GstQuery * query)
       }
 
       gst_query_set_seeking (query, fmt, seekable, seekable ? 0 : -1, -1);
-
       break;
     }
     default:
@@ -1416,8 +1416,8 @@ feed_textbuf (GstSubParse * self, GstBuffer * buf)
   gst_adapter_push (self->adapter, buf);
 
   avail = gst_adapter_available (self->adapter);
-  data = gst_adapter_map (self->adapter, avail),
-      input = convert_encoding (self, (const gchar *) data, avail, &consumed);
+  data = gst_adapter_map (self->adapter, avail);
+  input = convert_encoding (self, (const gchar *) data, avail, &consumed);
 
   if (input && consumed > 0) {
     self->textbuf = g_string_append (self->textbuf, input);