From 2011ba719ebd639eb084b39733f12bd67bff01e3 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Feb 2016 12:19:34 +0100
Subject: [PATCH] Remove changes that should not have been commited in previous
 commit.

---
 build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp | 3 ---
 build/windows10/ms2-tester/VideoPage.xaml                  | 4 ++--
 build/windows10/ms2-tester/ms2-tester.csproj               | 3 ---
 src/audiofilters/msopus.c                                  | 2 +-
 src/crypto/ms_srtp.c                                       | 2 +-
 tester/mediastreamer2_tester_windows.cpp                   | 2 --
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp b/build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp
index 3039e5ed..f1ebbc1f 100644
--- a/build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp
+++ b/build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp
@@ -52,7 +52,4 @@ int CALLBACK WinMain(_In_  HINSTANCE, _In_  HINSTANCE, _In_  LPSTR, _In_  int)
         }
         Windows::Foundation::Uninitialize();
 	}
-	else {
-		OutputDebugStringW(L"Failed MS2TesterHost initialization");
-	}
 }
diff --git a/build/windows10/ms2-tester/VideoPage.xaml b/build/windows10/ms2-tester/VideoPage.xaml
index df47bd64..b7766d3c 100644
--- a/build/windows10/ms2-tester/VideoPage.xaml
+++ b/build/windows10/ms2-tester/VideoPage.xaml
@@ -44,9 +44,9 @@
                 <TextBlock x:Name="VideoSizeLabel" Grid.Row="2" Grid.Column="0" Text="Video size:" VerticalAlignment="Center" Margin="8"/>
                 <ComboBox x:Name="VideoSizeComboBox" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="8">
                     <ComboBoxItem Content="720P"/>
-                    <ComboBoxItem Content="VGA" IsSelected="True"/>
+                    <ComboBoxItem Content="VGA"/>
                     <ComboBoxItem Content="CIF"/>
-                    <ComboBoxItem Content="QVGA"/>
+                    <ComboBoxItem Content="QVGA" IsSelected="True"/>
                     <ComboBoxItem Content="QCIF"/>
                 </ComboBox>
                 <TextBlock x:Name="FramerateLabel" Grid.Row="3" Grid.Column="0" Text="FPS:" VerticalAlignment="Center" Margin="8"/>
diff --git a/build/windows10/ms2-tester/ms2-tester.csproj b/build/windows10/ms2-tester/ms2-tester.csproj
index d1c9c3cc..d4673c30 100644
--- a/build/windows10/ms2-tester/ms2-tester.csproj
+++ b/build/windows10/ms2-tester/ms2-tester.csproj
@@ -119,9 +119,6 @@
   <ItemGroup>
     <Content Include="Assets\StoreLogo.png" />
     <Content Include="Assets\WideLogo.png" />
-    <Content Include="LeakTrack.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\Images\nowebcamCIF.jpg" />
     <Content Include="Assets\Logo.png" />
diff --git a/src/audiofilters/msopus.c b/src/audiofilters/msopus.c
index 33545214..87634553 100644
--- a/src/audiofilters/msopus.c
+++ b/src/audiofilters/msopus.c
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "ortp/rtp.h"
 
 #include <stdint.h>
-#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
+#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
 #include <opus.h>
 #else
 #include <opus/opus.h>
diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c
index 9dede7f5..7a2604ba 100644
--- a/src/crypto/ms_srtp.c
+++ b/src/crypto/ms_srtp.c
@@ -34,7 +34,7 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 
-#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
+#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
 // Android and Windows phone don't use make install
 #include <srtp.h>
 //#include <srtp_priv.h>
diff --git a/tester/mediastreamer2_tester_windows.cpp b/tester/mediastreamer2_tester_windows.cpp
index 8325c48b..0fa66229 100644
--- a/tester/mediastreamer2_tester_windows.cpp
+++ b/tester/mediastreamer2_tester_windows.cpp
@@ -194,7 +194,6 @@ void NativeTester::initVideo()
 	char cPath[MAX_FILEPATH_SIZE] = { 0 };
 	wcstombs(cPath, wsPath.c_str(), sizeof(cPath));
 	ms_static_image_set_default_image(cPath);
-	//ortp_load_leak_track_dll();
 }
 
 void NativeTester::uninitVideo()
@@ -263,7 +262,6 @@ void NativeTester::stopVideoStream()
 	ms_filter_log_statistics();
 	video_stream_stop(_videoStream);
 	_videoStream = NULL;
-	ortp_dump_memory_leaks();
 }
 
 void NativeTester::changeCamera(Platform::String^ camera)
-- 
2.21.0