From 055177c5b924e3ea3050abeec6d3a8dfe75b9542 Mon Sep 17 00:00:00 2001 From: smorlat Date: Sun, 30 Nov 2008 21:10:30 +0000 Subject: [PATCH] - remove video window system menu - update .dev files git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@187 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/gtk-glade/linphone.iss | 2 +- linphone/mediastreamer2/src/videoout.c | 2 +- linphone/oRTP/build/win32native/ortp-dll.dev | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss index 8af8bba96..8318a5b2b 100755 --- a/linphone/gtk-glade/linphone.iss +++ b/linphone/gtk-glade/linphone.iss @@ -36,7 +36,7 @@ Source: "..\..\linphone-deps\bin\exosip2.dll"; DestDir: "{app}"; Flags: ignoreve Source: "..\..\linphone-deps\bin\libogg.dll"; DestDir: "{app}"; Flags: ignoreversion ;;Source: "..\..\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\linphone-deps\bin\avcodec.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\linphone-deps\bin\avutil.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\avutil-49.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\linphone-deps\bin\swscale.dll"; DestDir: "{app}"; Flags: ignoreversion ;;Source: "..\..\linphone-deps\bin\libspeex-1.dll"; DestDir: "{app}"; Flags: ignoreversion ;;Source: "..\..\linphone-deps\bin\libspeexdsp-1.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/linphone/mediastreamer2/src/videoout.c b/linphone/mediastreamer2/src/videoout.c index 6ecb0bbac..1111e0262 100644 --- a/linphone/mediastreamer2/src/videoout.c +++ b/linphone/mediastreamer2/src/videoout.c @@ -289,7 +289,7 @@ static HWND create_window(int w, int h) ms_error("AdjustWindowRect failed."); } ms_message("AdjustWindowRect: %li,%li %li,%li",rect.left,rect.top,rect.right,rect.bottom); - hwnd=CreateWindow("Video Window", "Video window", WS_OVERLAPPEDWINDOW|WS_VISIBLE , + hwnd=CreateWindow("Video Window", "Video window", /*WS_OVERLAPPEDWINDOW*/ WS_THICKFRAME|WS_VISIBLE , CW_USEDEFAULT, CW_USEDEFAULT, rect.right-rect.left,rect.bottom-rect.top, NULL, NULL, hInstance, NULL); if (hwnd==NULL){ diff --git a/linphone/oRTP/build/win32native/ortp-dll.dev b/linphone/oRTP/build/win32native/ortp-dll.dev index 4be4861f7..879236111 100755 --- a/linphone/oRTP/build/win32native/ortp-dll.dev +++ b/linphone/oRTP/build/win32native/ortp-dll.dev @@ -442,7 +442,7 @@ Libs= PrivateResource= ResourceIncludes= MakeIncludes= -Compiler=-DORTP_INET6_@@_-D_WORKAROUND_MINGW32_BUGS _@@_-Wall -Werror _@@_-D_WIN32_WINNT=0x0501_@@_-DORTP_STATIC_@@_ +Compiler=-DORTP_INET6_@@_-Wall -Werror _@@_-D_WIN32_WINNT=0x0501_@@_-DORTP_STATIC_@@_ CppCompiler=_@@_ Linker=-lws2_32_@@_-liphlpapi_@@_-lwinmm_@@_ PreprocDefines=