mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
Merge branch 'master' into 0.11
Conflicts: tests/check/elements/flacparse.c
This commit is contained in:
commit
63ec4ca38b
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue