X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpulse%2Fformat.c;h=4f4b3425da97e4bed19132e01af5486ee3aa8598;hb=3a5a0f6652c749f42ba3757fd563a3ff7b6b35af;hp=424df0e696228d2f1d18b3c63f917fbe512edcb0;hpb=066dd942aa1855f1a05d1352b13dd540fa0c033f;p=platform%2Fupstream%2Fpulseaudio.git

diff --git a/src/pulse/format.c b/src/pulse/format.c
index 424df0e..4f4b342 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -218,7 +218,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 ret = -PA_ERR_INVALID;
 
     pa_assert(f);
@@ -233,21 +232,12 @@ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_chan
         goto out;
     if (pa_format_info_get_channels(f, &ss->channels) < 0)
         goto out;
-
-    if (map) {
-        pa_channel_map_init(map);
-
-        if (pa_format_info_get_prop_string(f, PA_PROP_FORMAT_CHANNEL_MAP, &m) == 0)
-            if (pa_channel_map_parse(map, m) == NULL)
-                goto out;
-    }
+    if (map && pa_format_info_get_channel_map(f, map) < 0)
+        goto out;
 
     ret = 0;
 
 out:
-    if (m)
-        pa_xfree(m);
-
     return ret;
 }