From d4676e27dd0acaf8d13ec0a73a36912fdbe26015 Mon Sep 17 00:00:00 2001 From: SuslikV Date: Mon, 27 Nov 2017 15:27:14 +0200 Subject: [PATCH] libobs: Fix height return value condition This should fix "Output fails" when Rescale Output height set to 0. --- libobs/obs-encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libobs/obs-encoder.c b/libobs/obs-encoder.c index 7abb853e7..e4d1320ad 100644 --- a/libobs/obs-encoder.c +++ b/libobs/obs-encoder.c @@ -611,7 +611,7 @@ uint32_t obs_encoder_get_height(const obs_encoder_t *encoder) if (!encoder->media) return 0; - return encoder->scaled_width != 0 ? + return encoder->scaled_height != 0 ? encoder->scaled_height : video_output_get_height(encoder->media); }