[Telepathy-commits] [telepathy-gabble/master] Allow updating channels from 0 to anything.

Will Thompson will.thompson at collabora.co.uk
Fri Mar 20 11:08:16 PDT 2009


Olivier tells me 0 is a wildcard, so it's fine to change from 0 to a
specified number of channels.
---
 src/jingle-media-rtp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 41b85af..4666388 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -400,7 +400,8 @@ codec_update_coherent (const JingleCodec *old_c,
       return FALSE;
     }
 
-  if (new_c->channels != old_c->channels)
+  if (old_c->channels != 0 &&
+      new_c->channels != old_c->channels)
     {
       g_set_error (e, domain, code,
           "tried to change codec %u (%s)'s channels from %u to %u",
-- 
1.5.6.5



More information about the telepathy-commits mailing list