[vlc-devel] commit: Audio format: requires same sample rate and channels count ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 17 20:25:24 2010 +0200| [39a6423983ced556a4a43272b93f0ecc8e022744] | committer: Rémi Denis-Courmont 

Audio format: requires same sample rate and channels count

This fixes #3168. The audio_format plugin was ignorantly claiming to
convert the sample rate and channel count, though it obviously did not.

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

 modules/audio_filter/converter/format.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c
index 9c844de..b9743a4 100644
--- a/modules/audio_filter/converter/format.c
+++ b/modules/audio_filter/converter/format.c
@@ -206,6 +206,9 @@ static int Open( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
     int i;
 
+    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
+        return VLC_EGENERIC;
+
     for( i = 0; ConvertTable[i].pf_convert != NULL; i++ )
     {
         if( ConvertTable[i].i_src == p_filter->fmt_in.i_codec &&