ffmpeg/swscale: Fix warning and broken get_target_size

2019-07-06 13:07:03 +02:00
parent 74fb3a3847
commit 3154443e18
2 changed files with 8 additions and 1 deletions
@@ -94,7 +94,11 @@ void ffmpeg::swscale::set_target_size(uint32_t width, uint32_t height)
 	target_size.second = height;
 }

-void ffmpeg::swscale::get_target_size(uint32_t& width, uint32_t& height) {}
+void ffmpeg::swscale::get_target_size(uint32_t& width, uint32_t& height)
+{
+	width  = target_size.first;
+	height = target_size.second;
+}

 std::pair<uint32_t, uint32_t> ffmpeg::swscale::get_target_size()
 {
@@ -23,8 +23,11 @@
 #include <utility>

 extern "C" {
+#pragma warning(push)
+#pragma warning(disable : 4244)
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
+#pragma warning(pop)
 }

 namespace ffmpeg {