[vlc-commits] aout: remove extra non linear conversion

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jun 20 13:40:10 2017 +0200| [895bb1a6e9be4e93ba5d8ebaaa0193ed5c52e47b] | committer: Thomas Guillem

aout: remove extra non linear conversion

The non linear conversion is now done from aout_FiltersNew(), before this
function is called.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=895bb1a6e9be4e93ba5d8ebaaa0193ed5c52e47b
---

 src/audio_output/filters.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index b3a5abb3f0..400d6e72f7 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -139,24 +139,6 @@ static int aout_FiltersPipelineCreate(vlc_object_t *obj, filter_t **filters,
     audio_sample_format_t input = *infmt;
     unsigned n = 0;
 
-    /* Encapsulate or decode non-linear formats */
-    if (!AOUT_FMT_LINEAR(infmt) && infmt->i_format != outfmt->i_format)
-    {
-        if (n == max)
-            goto overflow;
-
-        filter_t *f = TryFormat (obj, VLC_CODEC_S32N, &input);
-        if (f == NULL)
-            f = TryFormat (obj, VLC_CODEC_FL32, &input);
-        if (f == NULL)
-        {
-            msg_Err (obj, "cannot find %s for conversion pipeline",
-                     "decoder");
-            goto error;
-        }
-
-        filters[n++] = f;
-    }
     assert (AOUT_FMT_LINEAR(&input));
 
     /* Remix channels */