Commit 68b531ab authored by smorlat's avatar smorlat

Fix little bogs.



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@121 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent fb113617
......@@ -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 \
......
......@@ -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 }
};
......
......@@ -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){
......
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