[vlc-devel] [PATCH] audio output: Allow i_physical_channels to be unset when using pass through

Hugo Beauzée-Luyssen hugo at beauzee.fr
Tue Aug 1 14:08:24 CEST 2017


Fix #18614
---
 src/audio_output/output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 08104f8d29..1bd916044e 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -546,6 +546,7 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt,
         }
 
         aout_FormatPrepare (fmt);
+        assert (aout_FormatNbChannels(fmt) > 0);
     }
 
     aout->current_sink_info.headphones = false;
@@ -560,7 +561,6 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt,
                             i_nb_input_channels, i_forced_stereo_mode);
 
     aout_FormatPrepare (fmt);
-    assert (aout_FormatNbChannels(fmt) > 0);
     assert (fmt->i_bytes_per_frame > 0 && fmt->i_frame_length > 0);
     aout_FormatPrint (aout, "output", fmt);
     return 0;
-- 
2.11.0



More information about the vlc-devel mailing list