[pulseaudio-commits] r2138 - /branches/prepare-0.9.10/src/pulse/stream.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Mar 27 22:20:56 2008
New Revision: 2138

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2138&root=pulseaudio&view=rev
Log:
merge r2074 from trunk

Modified:
    branches/prepare-0.9.10/src/pulse/stream.c

Modified: branches/prepare-0.9.10/src/pulse/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/pulse/stream.c?rev=2138&root=pulseaudio&r1=2137&r2=2138&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/pulse/stream.c (original)
+++ branches/prepare-0.9.10/src/pulse/stream.c Thu Mar 27 22:20:56 2008
@@ -586,7 +586,7 @@
         }
     }
 
-    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;