From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 20 Feb 2012 15:07:50 +0000 (+0100)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~507^2~15767
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9f5def9d11c9a6623d7ed9d365160a4d8076b17;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	ext/opus/gstopusparse.c
	gst/colorspace/colorspace.c
---

a9f5def9d11c9a6623d7ed9d365160a4d8076b17
diff --cc ext/gme/gstgme.c
index a3cfdaa,f8a387d..1cd6161
--- a/ext/gme/gstgme.c
+++ b/ext/gme/gstgme.c
@@@ -353,17 -367,15 +353,17 @@@ gst_gme_play (GstPad * pad
    const int NUM_SAMPLES = 1600; /* 4 bytes (stereo 16-bit) per sample */
  
    if (!seeking) {
 +    GstMapInfo map;
 +
      out = gst_buffer_new_and_alloc (NUM_SAMPLES * 4);
 -    gst_buffer_set_caps (out, GST_PAD_CAPS (pad));
      GST_BUFFER_TIMESTAMP (out) = gme_tell (gme->player) * GST_MSECOND;
  
 -    gme_err =
 -        gme_play (gme->player, NUM_SAMPLES * 2,
 -        (short *) GST_BUFFER_DATA (out));
 +    gst_buffer_map (out, &map, GST_MAP_WRITE);
 +    gme_err = gme_play (gme->player, NUM_SAMPLES * 2, (short *) map.data);
 +    gst_buffer_unmap (out, &map);
 +
      if (gme_err) {
-       GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), (gme_err));
+       GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), ("%s", gme_err));
        gst_pad_pause_task (pad);
        gst_pad_push_event (pad, gst_event_new_eos ());
        gst_object_unref (gme);
diff --cc ext/opus/gstopusparse.c
index 9bb2c22,472e7b0..fe6a773
--- a/ext/opus/gstopusparse.c
+++ b/ext/opus/gstopusparse.c
@@@ -153,8 -148,10 +153,9 @@@ gst_opus_parse_check_valid_frame (GstBa
  
    parse = GST_OPUS_PARSE (base);
  
 -  data = GST_BUFFER_DATA (frame->buffer);
 -  size = GST_BUFFER_SIZE (frame->buffer);
 +  data = gst_buffer_map (frame->buffer, &size, NULL, GST_MAP_READ);
-   GST_DEBUG_OBJECT (parse, "Checking for frame, %u bytes in buffer", size);
+   GST_DEBUG_OBJECT (parse,
+       "Checking for frame, %" G_GSIZE_FORMAT " bytes in buffer", size);
  
    /* check for headers */
    is_idheader = gst_opus_header_is_id_header (frame->buffer);