jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Ensure rescale res is non-null and length > 0

Browse Source
This commit is contained in:
John Bradley 2015-03-31 15:48:06 -05:00
parent 97ca9e0ea5
commit 453b505637
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
obs/window-basic-main-outputs.cpp
View File

@ -414,9 +414,11 @@ inline void AdvancedOutput::SetupStreaming()
unsigned int cx = 0;
unsigned int cy = 0;
if (rescale && sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;
cy = 0;
if (rescale && rescaleRes && *rescaleRes) {
if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;
cy = 0;
}
}
obs_encoder_set_scaled_size(h264Streaming, cx, cy);
@ -459,9 +461,11 @@ inline void AdvancedOutput::SetupRecording()
if (useStreamEncoder) {
obs_output_set_video_encoder(fileOutput, h264Streaming);
} else {
if (rescale && sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;
cy = 0;
if (rescale && rescaleRes && *rescaleRes) {
if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;
cy = 0;
}
}
obs_encoder_set_scaled_size(h264Recording, cx, cy);