diff --git a/linphone/mediastreamer2/src/Makefile.am b/linphone/mediastreamer2/src/Makefile.am index 907c181a6..6d4e07b60 100644 --- a/linphone/mediastreamer2/src/Makefile.am +++ b/linphone/mediastreamer2/src/Makefile.am @@ -72,8 +72,7 @@ else libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c endif -libmediastreamer_la_SOURCES+= sdlout.c \ - videoenc.c \ +libmediastreamer_la_SOURCES+= videoenc.c \ videodec.c \ pixconv.c \ sizeconv.c \ diff --git a/linphone/mediastreamer2/src/nowebcam.c b/linphone/mediastreamer2/src/nowebcam.c index 54406eafc..2c2a0ee38 100644 --- a/linphone/mediastreamer2/src/nowebcam.c +++ b/linphone/mediastreamer2/src/nowebcam.c @@ -167,6 +167,12 @@ int static_image_set_vsize(MSFilter *f, void* data){ return 0; } +int static_image_get_vsize(MSFilter *f, void* data){ + SIData *d=(SIData*)f->data; + *(MSVideoSize*)data=d->vsize; + return 0; +} + int static_image_get_pix_fmt(MSFilter *f, void *data){ *(MSPixFmt*)data=MS_YUV420P; return 0; @@ -174,6 +180,7 @@ int static_image_get_pix_fmt(MSFilter *f, void *data){ MSFilterMethod static_image_methods[]={ { MS_FILTER_SET_VIDEO_SIZE, static_image_set_vsize }, + { MS_FILTER_GET_VIDEO_SIZE, static_image_get_vsize }, { MS_FILTER_GET_PIX_FMT, static_image_get_pix_fmt }, { 0,0 } }; diff --git a/linphone/mediastreamer2/src/videoout.c b/linphone/mediastreamer2/src/videoout.c index f29a8237c..07d58037f 100644 --- a/linphone/mediastreamer2/src/videoout.c +++ b/linphone/mediastreamer2/src/videoout.c @@ -487,6 +487,8 @@ void ms_display_destroy(MSDisplay *obj){ static MSDisplayDesc *default_display_desc=&ms_sdl_display_desc; #elif defined(WIN32) static MSDisplayDesc *default_display_desc=&ms_win_display_desc; +#else +static MSDisplayDesc *default_display_desc=NULL; #endif void ms_display_desc_set_default(MSDisplayDesc *desc){