Commit 63ec4ca3 authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

Conflicts:
	tests/check/elements/flacparse.c
parents 1ae32656 ec6b2e86
......@@ -231,11 +231,11 @@ GST_START_TEST (test_parse_flac_detect_stream)
if (i == 0) {
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_get_size (buf) == sizeof (comment_header));
fail_unless (gst_buffer_memcmp (buf, 0, comment_header,
sizeof (comment_header)));
sizeof (comment_header)) == 0);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment