[vlc-devel] commit: bandlimited: check input format more thoroughly (closes #3171) ( Rémi Denis-Courmont )

git version control git at videolan.org
Thu Dec 3 22:51:24 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec  3 23:49:52 2009 +0200| [d317eb91dbd131ab0f7fb135b72163b27e8e789c] | committer: Rémi Denis-Courmont 

bandlimited: check input format more thoroughly (closes #3171)

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

 modules/audio_filter/resampler/bandlimited.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index d76cc15..cbfd2a4 100644
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -409,8 +409,13 @@ static int OpenFilter( vlc_object_t *p_this )
     filter_sys_t *p_sys;
     unsigned int i_out_rate  = p_filter->fmt_out.audio.i_rate;
 
-    if( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate ||
-        p_filter->fmt_in.i_codec != VLC_CODEC_FL32 )
+    if ( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate
+      || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format
+      || p_filter->fmt_in.audio.i_physical_channels
+              != p_filter->fmt_out.audio.i_physical_channels
+      || p_filter->fmt_in.audio.i_original_channels
+              != p_filter->fmt_out.audio.i_original_channels
+      || p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 )
     {
         return VLC_EGENERIC;
     }




More information about the vlc-devel mailing list