[vlc-commits] mono: remove redundant checks
Rémi Denis-Courmont
git at videolan.org
Tue Nov 6 18:39:28 CET 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 6 19:34:22 2012 +0200| [ce7161533c7757d14f6b8e5c2b17e8e13e0d6f4c] | committer: Rémi Denis-Courmont
mono: remove redundant checks
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce7161533c7757d14f6b8e5c2b17e8e13e0d6f4c
---
modules/audio_filter/channel_mixer/mono.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index d2b3690..3d1c6a9 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -351,19 +351,9 @@ static int OpenFilter( vlc_object_t *p_this )
return VLC_EGENERIC;
}
- if( (p_filter->fmt_in.i_codec != VLC_CODEC_S16N) ||
- (p_filter->fmt_out.i_codec != VLC_CODEC_S16N) )
- {
- /*msg_Err( p_this, "filter discarded (invalid format)" );*/
- 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) ||
- (p_filter->fmt_in.audio.i_bitspersample !=
- p_filter->fmt_out.audio.i_bitspersample))
+ (p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N) )
{
/*msg_Err( p_this, "couldn't load mono filter" );*/
return VLC_EGENERIC;
More information about the vlc-commits
mailing list