xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

ffmpeg/swscale: Fix warning and broken get_target_size

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-06 13:07:03 +02:00
parent 74fb3a3847
commit 3154443e18
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ffmpeg/swscale.cpp
+5 -1
View File
@@ -94,7 +94,11 @@ void ffmpeg::swscale::set_target_size(uint32_t width, uint32_t height)
target_size.second = 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() std::pair<uint32_t, uint32_t> ffmpeg::swscale::get_target_size()
{ {
source/ffmpeg/swscale.hpp
+3
View File
@@ -23,8 +23,11 @@
#include <utility> #include <utility>
extern "C" { extern "C" {
#pragma warning(push)
#pragma warning(disable : 4244)
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#pragma warning(pop)
} }
namespace ffmpeg { namespace ffmpeg {