[Iaxclient-cvs] SF.net SVN: iaxclient: [1133] trunk/lib/iaxclient_lib.c

[<do...@us...>]

Revision: 1133
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1133&view=rev
Author:   dohpaz
Date:     2007-09-13 06:50:59 -0700 (Thu, 13 Sep 2007)

Log Message:
-----------
Only NOTICE (warn) of video codec negotiation failure if incoming call wanted video. Also remove condition that could not be reached because it was handled earlier.

Modified Paths:
--------------
    trunk/lib/iaxclient_lib.c

Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c	2007-09-12 19:54:25 UTC (rev 1132)
+++ trunk/lib/iaxclient_lib.c	2007-09-13 13:50:59 UTC (rev 1133)
@@ -1704,21 +1704,14 @@
 				video_format = iaxc_choose_codec(video_format);
 			}
 		}
-	}
 
-	if ( !video_format )
-	{
-		if ( format )
+		/* All video negotiations failed, then warn */
+		if ( !video_format )
 		{
 			iaxci_usermsg(IAXC_NOTICE,
-					"Notice: could not negotiate common video codec");
+										"Notice: could not negotiate common video codec");
 			iaxci_usermsg(IAXC_NOTICE,
-					"Notice: switching to audio-only call");
-		} else
-		{
-			iax_reject(e->session,
-					"Could not negotiate common audio and video codec");
-			return;
+										"Notice: switching to audio-only call");
 		}
 	}
 #endif	/* USE_VIDEO */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.