From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 6 Nov 2012 17:36:48 +0000 (+0200)
Subject: gain: setup filter_t only when successful
X-Git-Tag: 2.1.0-git~2352
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f2ce1cab3e00cca4e136ca125f845beb8fdd10a4;p=vlc

gain: setup filter_t only when successful
---

diff --git a/modules/audio_filter/gain.c b/modules/audio_filter/gain.c
index 68e689a902..ead530f652 100644
--- a/modules/audio_filter/gain.c
+++ b/modules/audio_filter/gain.c
@@ -79,15 +79,7 @@ vlc_module_end()
 static int Open( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-    filter_sys_t *p_sys;
-
-    if ( !AOUT_FMTS_IDENTICAL( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
-    {
-        msg_Warn( p_filter, "bad input or output format" );
-        return VLC_EGENERIC;
-    }
-
-    p_sys = vlc_object_create( p_this, sizeof( *p_sys ) );
+    filter_sys_t *p_sys = vlc_object_create( p_this, sizeof( *p_sys ) );
     if( unlikely( p_sys == NULL ) )
         return VLC_ENOMEM;
 
@@ -104,6 +96,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->f_gain = var_InheritFloat( p_filter->p_parent, "gain-value" );
     msg_Dbg( p_filter, "gain multiplier sets to %.2fx", p_sys->f_gain );
 
+    p_filter->fmt_out.audio = p_filter->fmt_in.audio;
     p_filter->pf_audio_filter = Process;
     return VLC_SUCCESS;
 }