From 3154443e185d8a00c9f300834fcc0608f4438572 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sat, 6 Jul 2019 13:07:03 +0200 Subject: [PATCH] ffmpeg/swscale: Fix warning and broken get_target_size --- source/ffmpeg/swscale.cpp | 6 +++++- source/ffmpeg/swscale.hpp | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/ffmpeg/swscale.cpp b/source/ffmpeg/swscale.cpp index 184a22a..22caba7 100644 --- a/source/ffmpeg/swscale.cpp +++ b/source/ffmpeg/swscale.cpp @@ -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 ffmpeg::swscale::get_target_size() { diff --git a/source/ffmpeg/swscale.hpp b/source/ffmpeg/swscale.hpp index 1e64d7c..685e6bb 100644 --- a/source/ffmpeg/swscale.hpp +++ b/source/ffmpeg/swscale.hpp @@ -23,8 +23,11 @@ #include extern "C" { +#pragma warning(push) +#pragma warning(disable : 4244) #include #include +#pragma warning(pop) } namespace ffmpeg {