[vlc-commits] aout: tolerate lack of a resampler if the input and output rates match

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 17 22:32:26 2012 +0200| [bc1c318f99443b783704af74a765f1446f188d03] | committer: Rémi Denis-Courmont

aout: tolerate lack of a resampler if the input and output rates match

Synchronization will not be so good (as with S/PDIF), but audio will
still work. Anyway, this should hardly ever happen since the ugly
resampler supports all linear formats.

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

 src/audio_output/filters.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 06ba42d..115925a 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -574,7 +574,7 @@ int aout_FiltersNew (audio_output_t *aout,
     assert (AOUT_FMTS_IDENTICAL(&output_format, outfmt));
     owner->resampler = FindResampler (VLC_OBJECT(aout), &input_format,
                                       &output_format);
-    if (owner->resampler == NULL)
+    if (owner->resampler == NULL && input_format.i_rate != outfmt->i_rate)
     {
         msg_Err (aout, "cannot setup a resampler");
         goto error;