Merge branch '0.11' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good into 0.11

2 files changed, 14 insertions, 16 deletions

diff --git a/ext/soup/gstsouphttpclientsink.c b/ext/soup/gstsouphttpclientsink.c
index 712cee56d..c1ef3f464 100644
--- a/ext/soup/gstsouphttpclientsink.c
+++ b/ext/soup/gstsouphttpclientsink.c
@@ -623,30 +623,28 @@ send_message_locked (GstSoupHttpClientSink * souphttpsink)
   if (souphttpsink->offset == 0) {
     for (g = souphttpsink->streamheader_buffers; g; g = g_list_next (g)) {
       GstBuffer *buffer = g->data;
-      gpointer data;
-      gsize size;
+      GstMapInfo map;
 
       /* FIXME, lifetime of the buffer? */
-      data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
+      gst_buffer_map (buffer, &map, GST_MAP_READ);
       soup_message_body_append (souphttpsink->message->request_body,
-          SOUP_MEMORY_STATIC, data, size);
-      n += size;
-      gst_buffer_unmap (buffer, data, size);
+          SOUP_MEMORY_STATIC, map.data, map.size);
+      n += map.size;
+      gst_buffer_unmap (buffer, &map);
     }
   }
 
   for (g = souphttpsink->queued_buffers; g; g = g_list_next (g)) {
     GstBuffer *buffer = g->data;
     if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS)) {
-      gpointer data;
-      gsize size;
+      GstMapInfo map;
 
       /* FIXME, lifetime of the buffer? */
-      data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
+      gst_buffer_map (buffer, &map, GST_MAP_READ);
       soup_message_body_append (souphttpsink->message->request_body,
-          SOUP_MEMORY_STATIC, data, size);
-      n += size;
-      gst_buffer_unmap (buffer, data, size);
+          SOUP_MEMORY_STATIC, map.data, map.size);
+      n += map.size;
+      gst_buffer_unmap (buffer, &map);
     }
   }
 
diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c
index 42723ee4b..55f52fecd 100644
--- a/ext/soup/gstsouphttpsrc.c
+++ b/ext/soup/gstsouphttpsrc.c
@@ -876,7 +876,7 @@ gst_soup_http_src_finished_cb (SoupMessage * msg, GstSoupHTTPSrc * src)
 typedef struct
 {
   GstBuffer *buffer;
-  gpointer data;
+  GstMapInfo map;
 } SoupGstChunk;
 
 static void
@@ -884,7 +884,7 @@ gst_soup_http_src_chunk_free (gpointer user_data)
 {
   SoupGstChunk *chunk = (SoupGstChunk *) user_data;
 
-  gst_buffer_unmap (chunk->buffer, chunk->data, -1);
+  gst_buffer_unmap (chunk->buffer, &chunk->map);
   gst_buffer_unref (chunk->buffer);
   g_slice_free (SoupGstChunk, chunk);
 }
@@ -919,9 +919,9 @@ gst_soup_http_src_chunk_allocator (SoupMessage * msg, gsize max_len,
 
   chunk = g_slice_new0 (SoupGstChunk);
   chunk->buffer = gstbuf;
-  chunk->data = gst_buffer_map (gstbuf, &length, NULL, GST_MAP_READWRITE);
+  gst_buffer_map (gstbuf, &chunk->map, GST_MAP_READWRITE);
 
-  soupbuf = soup_buffer_new_with_owner (chunk->data, length,
+  soupbuf = soup_buffer_new_with_owner (chunk->map.data, chunk->map.size,
       chunk, gst_soup_http_src_chunk_free);
 
   return soupbuf;