From: Vincent Becker <vincentx.becker@intel.com>
Date: Tue, 14 Dec 2010 17:08:14 +0000 (+0100)
Subject: Fix return value of pa_sndfile_format_from_string
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/12c3e97bb4ebca02a94bdf4b719fd50c72dfbdba

Fix return value of pa_sndfile_format_from_string

This prevented to use pacat --file-format option correctly
---

diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 4f7f8bdb..9d15a868 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -416,7 +416,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strcasecmp(name, fi.name) == 0)
-            return i;
+            return fi.format;
     }
 
     /* Then, try to match via the full extension */
@@ -428,7 +428,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strcasecmp(name, fi.extension) == 0)
-            return i;
+            return fi.format;
     }
 
     /* Then, try to match via the start of the type string */
@@ -440,7 +440,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strncasecmp(name, fi.extension, strlen(name)) == 0)
-            return i;
+            return fi.format;
     }
 
     return -1;