Temp windows changes

CMakeLists.txt

@@ -46,14 +46,14 @@ set(CPACK_CREATE_DESKTOP_LINKS stormwatch)
 set(CPACK_PACKAGE_EXECUTABLES stormwatch "Stormwatch")
 set(CPACK_PACKAGE_NAME "Stormwatch")
 set(CPACK_PACKAGE_VENDOR "Stormwatch")
-set(CPACK_PACKAGE_VERSION "1.0.0")
+set(CPACK_PACKAGE_VERSION "1.1.0")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "1")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Joe Dillon")
 set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/platform/LICENSE.rtf")
 set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/platform/icon.ico")
-set(CPACK_WIX_PRODUCT_GUID "69084271-6E41-4008-9853-040FFF94DE99") 
+set(CPACK_WIX_PRODUCT_GUID "69084271-6E41-4008-9853-040FFF94DE98") 
 set(CPACK_WIX_UPGRADE_GUID "69084271-6E41-4008-9853-040FFF94DE99")
 
 include(CPack)

conanfile.txt

@@ -18,20 +18,22 @@ opencv:shared=False
 
 restinio:asio=boost
 
-ffmpeg:xcb=False
-ffmpeg:pulse=False
+#linux only
+#ffmpeg:alsa=False
+#ffmpeg:pulse=False
+#ffmpeg:vaapi=False
+#ffmpeg:vdpau=False
+#ffmpeg:xcb=False
+
 ffmpeg:vorbis=False
 ffmpeg:lzma=False
 ffmpeg:iconv=False
 ffmpeg:bzlib=False
 ffmpeg:opus=False
 ffmpeg:zmq=False
-ffmpeg:alsa=False
 ffmpeg:freetype=False
 ffmpeg:openjpeg=False
-ffmpeg:vdpau=False
 ffmpeg:zlib=False
-ffmpeg:vaapi=False
 ffmpeg:postproc=False
 ffmpeg:openh264=False
 ffmpeg:sdl2=False

src/VideoSaveJob.cpp

@@ -25,7 +25,7 @@
 // Translated to constexpr from
 // https://rosettacode.org/wiki/Convert_decimal_number_to_rational#C
 // I have pretty much no idea how this works...but it do
-constexpr AVRational NearestRational(double f)
+const AVRational NearestRational(double f)
 {
   int h[3] = { 0, 1, 0 };
   int k[3] = { 1, 0, 0 };