Changeset 118:43dc43877a5b in mediastreamer2

Timestamp:

Oct 27, 2008 5:19:35 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

Fix little bogs.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@121 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2/src

Files:

• Makefile.am (modified) (1 diff)
• nowebcam.c (modified) (2 diffs)
• videoout.c (modified) (1 diff)

linphone/mediastreamer2/src/Makefile.am

@@ -73 +73 @@
 endif
 
-libmediastreamer_la_SOURCES+=   sdlout.c   \
-                                videoenc.c \
+libmediastreamer_la_SOURCES+=   videoenc.c \
                                 videodec.c \
                                 pixconv.c  \

linphone/mediastreamer2/src/nowebcam.c

@@ -168 +168 @@
 }
 
+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;
@@ -175 +181 @@
 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 }

linphone/mediastreamer2/src/videoout.c

@@ -488 +488 @@
 #elif defined(WIN32)
 static MSDisplayDesc *default_display_desc=&ms_win_display_desc;
+#else
+static MSDisplayDesc *default_display_desc=NULL;
 #endif