[vlc-commits] karaoke: change format when needed instead of failing

Rémi Denis-Courmont git at videolan.org
Tue Nov 6 18:39:29 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov  6 19:37:05 2012 +0200| [b2e76597910ba6f1d2841b792bbcbc410d990a7a] | committer: Rémi Denis-Courmont

karaoke: change format when needed instead of failing

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

 modules/audio_filter/karaoke.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/audio_filter/karaoke.c b/modules/audio_filter/karaoke.c
index 81bc276..6205621 100644
--- a/modules/audio_filter/karaoke.c
+++ b/modules/audio_filter/karaoke.c
@@ -47,16 +47,14 @@ static int Open (vlc_object_t *obj)
 {
     filter_t *filter = (filter_t *)obj;
 
-    if (filter->fmt_in.audio.i_format != VLC_CODEC_FL32
-     || !AOUT_FMTS_IDENTICAL(&filter->fmt_in.audio, &filter->fmt_out.audio))
-        return VLC_EGENERIC;
-
     if (filter->fmt_in.audio.i_channels != 2)
     {
         msg_Err (filter, "voice removal requires stereo");
         return VLC_EGENERIC;
     }
 
+    filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
+    filter->fmt_out.audio = filter->fmt_in.audio;
     filter->pf_audio_filter = Process;
     return VLC_SUCCESS;
 }



More information about the vlc-commits mailing list