[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r307532 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Asterisk project]

Author: may
Date: Thu Feb 10 15:46:05 2011
New Revision: 307532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307532
Log:
resolve merge conflict on ooq931.c

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
    automerge = *

Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c?view=diff&rev=307532&r1=307531&r2=307532
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c Thu Feb 10 15:46:05 2011
@@ -2001,8 +2001,7 @@
    if (/* (!OO_TESTFLAG(call->flags, OO_M_FASTSTART) || 
         call->remoteFastStartOLCs.count == 0) && */
        !OO_TESTFLAG (call->flags, OO_M_TUNNELING) &&
-       ( (!call->h245listener && ooCreateH245Listener(call) == OO_OK) ||
-	 (call->h245listener && !call->pH245Channel)))
+       !call->h245listener && ooCreateH245Listener(call) == OO_OK)
    {
       connect->m.h245AddressPresent = TRUE;
       if (call->versionIP == 6) {