From 7e21dbc0e8232e771e627939b4668eae1e13462e Mon Sep 17 00:00:00 2001 From: aymeric Date: Tue, 28 Oct 2008 17:07:58 +0000 Subject: [PATCH] This is required for MSVC compiler git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@125 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/src/videostream.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/linphone/mediastreamer2/src/videostream.c b/linphone/mediastreamer2/src/videostream.c index f5d2155a8..cd39b6af9 100644 --- a/linphone/mediastreamer2/src/videostream.c +++ b/linphone/mediastreamer2/src/videostream.c @@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "mediastreamer2/msfilter.h" #include "mediastreamer2/msvideo.h" #include "mediastreamer2/msrtp.h" + + +#if defined(WIN32) || defined(_WIN32_WCE) +/* avoid double declaration of ms_win_display_desc + -> Including twice msvideoout.h inside mediastreamer2 + is NOT support with MSVC compiler. +*/ +#define MS_VIDEO_OUT_HANDLE_RESIZING MS_FILTER_METHOD_NO_ARG(MS_VIDEO_OUT_ID,1) +#define MS_VIDEO_OUT_AUTO_FIT MS_FILTER_METHOD(MS_VIDEO_OUT_ID,3,int) +#else #include "mediastreamer2/msvideoout.h" +#endif #ifdef HAVE_CONFIG_H #include "mediastreamer-config.h"