diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-04 22:07:56 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-04 22:07:56 +0100 |
commit | dcee8888650583abd106f818ee56d5dff9028bba (patch) | |
tree | 0c37a0f0d2766b5a00a74bc0d3a0a6d5b03a189a /src/modules/module-combine.c | |
parent | 3dd8800e6d0ab1f11e981d368ec2bef38c88ce99 (diff) | |
parent | 656fc6660fac6ad4524fd2b679cbd35c69033d3b (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r-- | src/modules/module-combine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 6ed4f141..4b2d6f9b 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -5,7 +5,7 @@ PulseAudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. PulseAudio is distributed in the hope that it will be useful, but @@ -487,7 +487,7 @@ static void sink_input_kill_cb(pa_sink_input *i) { struct output *o; pa_sink_input_assert_ref(i); - pa_assert(o = i->userdata); + pa_assert_se(o = i->userdata); pa_module_unload_request(o->userdata->module, TRUE); output_free(o); |