summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-22 02:00:32 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-22 02:00:32 +0000
commite04a8576bb113c19a51d026dd30de700b07055c7 (patch)
tree5574906b0c3fbd240f70cf879ee0431bc1487d56
parent6cfb09698a14b4634b447410496424eb0126bfce (diff)
minor optimization
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1886 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/sink-input.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 57c6c601..9360bee0 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -690,7 +690,7 @@ pa_resample_method_t pa_sink_input_get_resample_method(pa_sink_input *i) {
}
int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest, int immediately) {
- pa_resampler *new_resampler = NULL;
+ pa_resampler *new_resampler;
pa_sink *origin;
pa_usec_t silence_usec = 0;
pa_sink_input_move_info info;
@@ -739,7 +739,8 @@ int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest, int immediately) {
pa_log_warn("Unsupported resampling operation.");
return -1;
}
- }
+ } else
+ new_resampler = NULL;
pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE], i);