[vlc-commits] mono: Specify the expected format rather than failing

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jun 17 00:26:33 2014 +0300| [5b286b4d07e9cde4c1bf77ed349b4455d2dbe27a] | committer: Jean-Baptiste Kempf

mono: Specify the expected format rather than failing

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit c7e24bbe924e18fbde1a9c7a6177410ad0816945)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/audio_filter/channel_mixer/mono.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index bafda10..0bb71cc 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -347,13 +347,8 @@ 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_format != VLC_CODEC_S16N) ||
-        (p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N) )
-    {
-        /*msg_Err( p_this, "couldn't load mono filter" );*/
-        return VLC_EGENERIC;
-    }
+    p_filter->fmt_in.audio.i_format = VLC_CODEC_S16N;
+    p_filter->fmt_out.audio.i_format = VLC_CODEC_S16N;
 
     /* Allocate the memory needed to store the module's structure */
     p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );