[vlc-commits] aout: fix aout_CheckChannelExtraction return value

Thomas Guillem git at videolan.org
Wed Oct 21 18:27:46 CEST 2015


vlc/vlc-2.2 | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jul 27 17:18:24 2015 +0200| [e7c17306a63c646af1a53df4fbfb862ff7a47cd7] | committer: Jean-Baptiste Kempf

aout: fix aout_CheckChannelExtraction return value

This function returns true if channel extraction is needed.

If layouts are the same, channel extraction should be needed only if the number
of channels is different.

(cherry picked from commit d71d17755a1f8f196b22144fd1cb2f60ac619141)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 src/audio_output/common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index f92230e..09dca5c 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -511,7 +511,7 @@ bool aout_CheckChannelExtraction( int *pi_selection,
         if( pi_selection[i] != i )
             return true;
     }
-    return i_out == i_channels;
+    return i_out != i_channels;
 }
 
 /* Return the order in which filters should be inserted */



More information about the vlc-commits mailing list