summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-27 21:20:56 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-27 21:20:56 +0000
commit8d5ee5054b3d595adbcefaa2b01108de430666d1 (patch)
tree0de1223992d588fdee4e0457f2989626fedd2cce
parentc59a90c6c16177c8b87b31529318a308e9de04f7 (diff)
merge r2074 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2138 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulse/stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 92420825..cd70cdcb 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -586,7 +586,7 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED
}
}
- if (s->context->version >= 12) {
+ if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) {
pa_sample_spec ss;
pa_channel_map cm;
const char *dn = NULL;