summaryrefslogtreecommitdiff
path: root/src/pulse/format.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pulse/format.c')
-rw-r--r--src/pulse/format.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pulse/format.c b/src/pulse/format.c
index 1b4a1549..424df0e6 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -219,7 +219,6 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m
/* For PCM streams */
int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
char *m = NULL;
- int channels;
int ret = -PA_ERR_INVALID;
pa_assert(f);
@@ -232,11 +231,9 @@ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_chan
goto out;
if (pa_format_info_get_rate(f, &ss->rate) < 0)
goto out;
- if (pa_format_info_get_prop_int(f, PA_PROP_FORMAT_CHANNELS, &channels))
+ if (pa_format_info_get_channels(f, &ss->channels) < 0)
goto out;
- ss->channels = (uint8_t) channels;
-
if (map) {
pa_channel_map_init(map);