Merge branch 'v0.16.x'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-04-12 08:11:33 +02:00
5 changed files with 16 additions and 4 deletions

View File

@@ -192,7 +192,8 @@ audio_format_parse(struct audio_format *dest, const char *src,
}
audio_format_init(dest, rate, sample_format, channels);
assert(audio_format_valid(dest));
assert(mask ? audio_format_mask_valid(dest)
: audio_format_valid(dest));
return true;
}