Merge branch 'master' into 0.11

Conflicts:
	gst/flv/gstflvmux.c

diff --cc gst/flv/gstflvmux.c
index 33eddfacf7b8ff2a2492bb16faff2019da7bfcb7,47d5ba956976d1316845f08ae45e0caa433d7373..e5e4163ac97b368bdb26c2ebc025101fd2b15a57
--- 1/gst/flv/gstflvmux.c
--- 2/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@@ -657,15 -634,16 +658,18 @@@ gst_flv_mux_preallocate_index (GstFlvMu
  static GstBuffer *
  gst_flv_mux_create_number_script_value (const gchar * name, gdouble value)
  {
 -  GstBuffer *tmp = gst_buffer_new_and_alloc (2 + strlen (name) + 1 + 8);
 -  guint8 *data = GST_BUFFER_DATA (tmp);
 +  GstBuffer *tmp;
 +  guint8 *data;
+   gsize len = strlen (name);
  
-   _gst_buffer_new_and_alloc (2 + strlen (name) + 1 + 8, &tmp, &data);
++  _gst_buffer_new_and_alloc (2 + len + 1 + 8, &tmp, &data);
 +
-   GST_WRITE_UINT16_BE (data, strlen (name));    /* name length */
-   memcpy (&data[2], name, strlen (name));
-   data[2 + strlen (name)] = 0;  /* double */
-   GST_WRITE_DOUBLE_BE (data + 2 + strlen (name) + 1, value);
+   GST_WRITE_UINT16_BE (data, len);
+   data += 2;                    /* name length */
+   memcpy (data, name, len);
+   data += len;
+   *data++ = AMF0_NUMBER_MARKER; /* double type */
+   GST_WRITE_DOUBLE_BE (data, value);
  
    return tmp;
  }
@@@ -699,8 -676,9 +703,8 @@@ gst_flv_mux_create_metadata (GstFlvMux 
    /* Stream ID */
    data[8] = data[9] = data[10] = 0;
  
 -  tmp = gst_buffer_new_and_alloc (13);
 -  data = GST_BUFFER_DATA (tmp);
 +  _gst_buffer_new_and_alloc (13, &tmp, &data);
-   data[0] = 2;                  /* string */
+   data[0] = AMF0_STRING_MARKER; /* string */
    data[1] = 0;
    data[2] = 10;                 /* length 10 */
    memcpy (&data[3], "onMetaData", 10);