aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-03-23 22:22:51 +0100
committerMax Kellermann <max@duempel.org>2011-03-23 22:22:51 +0100
commit532f94a18797b8e349e78ab1e91cfa4a1205cbde (patch)
treeb8c33df444f09d9e27fdaa66db0e5cda0ceb3daf
parentb5fc2419e8387275c0c57e61fb205802979716b4 (diff)
downloadmpd-532f94a18797b8e349e78ab1e91cfa4a1205cbde.tar.gz
mpd-532f94a18797b8e349e78ab1e91cfa4a1205cbde.tar.xz
mpd-532f94a18797b8e349e78ab1e91cfa4a1205cbde.zip
audio_parser: fix assertion failure in audio format mask parser
Use audio_format_mask_valid() to verify a mask.
-rw-r--r--NEWS1
-rw-r--r--src/audio_parser.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1dd096e89..af6063588 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
ver 0.16.3 (2011/??/??)
+* fix assertion failure in audio format mask parser
ver 0.16.2 (2011/03/18)
diff --git a/src/audio_parser.c b/src/audio_parser.c
index ca5182c4a..139cf1c04 100644
--- a/src/audio_parser.c
+++ b/src/audio_parser.c
@@ -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;
}