[pulseaudio-commits] src/pulsecore

[Arun Raghavan]

 src/pulsecore/resampler.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6f94c56782e30ebacf13f0b4ce62de03f896981a
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date:   Wed Sep 11 22:47:24 2013 +0200

    resampler: Revert to auto if the rates are equal and copy is chosen
    
    This patch fixes a small mistake where we actually log that we are
    reverting to the auto resampler if we can't use the 'copy' resampler but
    never do the revert.
    
    This would lead to a crash if the user chooses the 'copy' resampler and
    then tries to play something that needs to be resampled.

diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 4480823..46cf2ab 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -214,6 +214,7 @@ static pa_resample_method_t pa_resampler_fix_method(
         case PA_RESAMPLER_COPY:
             if (rate_a != rate_b) {
                 pa_log_info("Resampler 'copy' cannot change sampling rate, reverting to resampler 'auto'.");
+                method = PA_RESAMPLER_AUTO;
                 break;
             }
                                      /* Else fall through */