vlc/vlc-1.2 | branch: master | Cheng Sun <[email protected]> | Sun Dec 18 23:04:03 2011 +0000| [faeca22a6d32c3bd9cc7cbf780f0406e5f8b3af3] | committer: Jean-Baptiste Kempf
Fix mono audio filter condition check Signed-off-by: Rémi Denis-Courmont <[email protected]> (cherry picked from commit 0e874482db5c4b856e5a947c0159df0060cdb1bb) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=faeca22a6d32c3bd9cc7cbf780f0406e5f8b3af3 --- modules/audio_filter/channel_mixer/mono.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index e776cae..9610ba3 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -369,10 +369,10 @@ static int OpenFilter( vlc_object_t *p_this ) return VLC_EGENERIC; } - if( (p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format) && - (p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate) && - (p_filter->fmt_in.audio.i_format != VLC_CODEC_S16N) && - (p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N) && + if( (p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format) || + (p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate) || + (p_filter->fmt_in.audio.i_format != VLC_CODEC_S16N) || + (p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N) || (p_filter->fmt_in.audio.i_bitspersample != p_filter->fmt_out.audio.i_bitspersample)) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
