Commit 4ebf0a9e authored by smorlat's avatar smorlat

fix various bugs.



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@202 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 9b0a0b67
......@@ -911,6 +911,9 @@ void linphone_core_set_sip_port(LinphoneCore *lc,int port)
lc->sip_conf.sip_port=port;
if (exosip_running) eXosip_quit();
eXosip_init();
err=0;
eXosip_set_option(13,&err); /*13=EXOSIP_OPT_SRV_WITH_NAPTR, as it is an enum value, we can't use it unless we are sure of the
version of eXosip, which is not the case*/
eXosip_enable_ipv6(lc->sip_conf.ipv6_enabled);
if (lc->sip_conf.ipv6_enabled)
anyaddr="::0";
......
......@@ -14,7 +14,7 @@ CPPFLAGS=$CPPFLAGS_save
dnl check for eXosip2 libs
LDFLAGS_save=$LDFLAGS
LDFLAGS=$OSIP_LIBS
LDFLAGS="$OSIP_LIBS $LDFLAGS"
LIBS_save=$LIBS
AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
[],
......@@ -24,6 +24,10 @@ AC_CHECK_LIB([eXosip2],[eXosip_get_version],
[AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])],
[],
[-losipparser2 -losip2 -lpthread])
dnl AC_CHECK_LIB([eXosip2],[eXosip_get_naptr],
dnl [AC_DEFINE([HAVE_EXOSIP_NAPTR_SUPPORT],[1],[Defined when eXosip_get_naptr is available])],
dnl [],
dnl [-losipparser2 -losip2 -lpthread])
LIBS=$LIBS_save
LDFLAGS=$LDFLAGS_save
......
......@@ -522,6 +522,7 @@ typedef struct VideoOut
MSPicture local_pic;
MSRect local_rect;
mblk_t *local_msg;
MSVideoSize prevsize;
int corner;
struct SwsContext *sws1;
struct SwsContext *sws2;
......@@ -589,6 +590,8 @@ static void video_out_init(MSFilter *f){
obj->ratio.den=9;
def_size.width=MS_VIDEO_SIZE_CIF_W;
def_size.height=MS_VIDEO_SIZE_CIF_H;
obj->prevsize.width=0;
obj->prevsize.height=0;
obj->local_msg=NULL;
obj->corner=0;
obj->sws1=NULL;
......@@ -725,7 +728,8 @@ static void video_out_process(MSFilter *f){
cur.height=obj->fbuf.h;
newsize.width=src.w;
newsize.height=src.h;
if (obj->autofit && !ms_video_size_equal(newsize,cur) ) {
if (obj->autofit && !ms_video_size_equal(newsize,obj->prevsize) ) {
obj->prevsize=newsize;
/*don't resize less than QVGA, it is too small*/
if (ms_video_size_greater_than(MS_VIDEO_SIZE_QVGA,newsize)){
newsize=MS_VIDEO_SIZE_QVGA;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment