[vlc-commits] audiotrack: factor i_nb_channels

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon May  4 16:25:08 2015 +0200| [d54ef066c2279b735922445b9310fc0d9ba35d7a] | committer: Thomas Guillem

audiotrack: factor i_nb_channels

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

 modules/audio_output/audiotrack.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index c4e5b14..fb3e517 100644
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -912,10 +912,10 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
         else
             p_sys->fmt.i_physical_channels = AOUT_CHANS_STEREO;
     }
-    i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
 
     do
     {
+        i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
         i_bytes_per_frame = i_nb_channels *
                             aout_BitsPerSample( p_sys->fmt.i_format ) / 8;
         i_rate = p_sys->fmt.i_format == VLC_CODEC_SPDIFB ?
@@ -953,7 +953,6 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
                 msg_Warn( p_aout, "5.1 or 7.1 configuration failed, "
                                   "fallback to Stereo" );
                 p_sys->fmt.i_physical_channels = AOUT_CHANS_STEREO;
-                i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
             }
             else
                 break;