vlc | branch: master | Thomas Guillem <[email protected]> | Fri Jul 7 11:39:44 2017 +0200| [ea013472a5dffd2725ea107c462a7b8f3424bd14] | committer: Thomas Guillem
bandlimited: don't require a valid channel layout > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea013472a5dffd2725ea107c462a7b8f3424bd14 --- modules/audio_filter/resampler/bandlimited.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c index d25dc45bd5..abd8a50161 100644 --- a/modules/audio_filter/resampler/bandlimited.c +++ b/modules/audio_filter/resampler/bandlimited.c @@ -109,7 +109,7 @@ static block_t *Resample( filter_t * p_filter, block_t * p_in_buf ) filter_sys_t *p_sys = p_filter->p_sys; unsigned int i_out_rate = p_filter->fmt_out.audio.i_rate; - int i_nb_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); + int i_nb_channels = p_filter->fmt_in.audio.i_channels; /* Check if we really need to run the resampler */ if( i_out_rate == p_filter->fmt_in.audio.i_rate ) @@ -291,10 +291,7 @@ static int OpenFilter( vlc_object_t *p_this ) if ( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format - || p_filter->fmt_in.audio.i_physical_channels - != p_filter->fmt_out.audio.i_physical_channels - || p_filter->fmt_in.audio.i_original_channels - != p_filter->fmt_out.audio.i_original_channels + || p_filter->fmt_in.audio.i_channels != p_filter->fmt_out.audio.i_channels || p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 ) { return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
