projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c55648c
)
mime: Move assert to correct position
author
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Thu, 8 Dec 2011 08:49:50 +0000
(14:19 +0530)
committer
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Tue, 13 Dec 2011 03:40:08 +0000
(09:10 +0530)
src/pulsecore/mime-type.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/mime-type.c
b/src/pulsecore/mime-type.c
index
b9fe944
..
09ce00b
100644
(file)
--- a/
src/pulsecore/mime-type.c
+++ b/
src/pulsecore/mime-type.c
@@
-145,6
+145,7
@@
void pa_sample_spec_mimefy(pa_sample_spec *ss, pa_channel_map *cm) {
char *pa_sample_spec_to_mime_type(const pa_sample_spec *ss, const pa_channel_map *cm) {
pa_assert(pa_channel_map_compatible(cm, ss));
+ pa_assert(pa_sample_spec_valid(ss));
if (!pa_sample_spec_is_mime(ss, cm))
return NULL;
@@
-168,8
+169,6
@@
char *pa_sample_spec_to_mime_type(const pa_sample_spec *ss, const pa_channel_map
default:
pa_assert_not_reached();
}
-
- pa_assert(pa_sample_spec_valid(ss));
}
char *pa_sample_spec_to_mime_type_mimefy(const pa_sample_spec *_ss, const pa_channel_map *_cm) {