From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 14 Feb 2012 09:51:38 +0000 (+0100)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~509^2~7297
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63ec4ca38bcd272151feeac05a4a4410b8488767;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	tests/check/elements/flacparse.c
---

63ec4ca38bcd272151feeac05a4a4410b8488767
diff --cc tests/check/elements/flacparse.c
index 0204c17,ebff9b4..497a98a
--- a/tests/check/elements/flacparse.c
+++ b/tests/check/elements/flacparse.c
@@@ -229,13 -229,13 +229,13 @@@ GST_START_TEST (test_parse_flac_detect_
      fail_unless (G_VALUE_TYPE (bufval) == GST_TYPE_BUFFER);
      buf = g_value_peek_pointer (bufval);
      if (i == 0) {
 -      fail_unless (GST_BUFFER_SIZE (buf) == sizeof (streaminfo_header));
 -      fail_unless (memcmp (GST_BUFFER_DATA (buf), streaminfo_header,
 +      fail_unless (gst_buffer_get_size (buf) == sizeof (streaminfo_header));
 +      fail_unless (gst_buffer_memcmp (buf, 0, streaminfo_header,
-               sizeof (streaminfo_header)));
+               sizeof (streaminfo_header)) == 0);
      } else if (i == 1) {
 -      fail_unless (GST_BUFFER_SIZE (buf) == sizeof (comment_header));
 -      fail_unless (memcmp (GST_BUFFER_DATA (buf), comment_header,
 +      fail_unless (gst_buffer_get_size (buf) == sizeof (comment_header));
 +      fail_unless (gst_buffer_memcmp (buf, 0, comment_header,
-               sizeof (comment_header)));
+               sizeof (comment_header)) == 0);
      }
    }