From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 22 Apr 2017 18:12:34 +0000 (+0200)
Subject: Fix an assertion failure when moving an input from non-interlacing to interlaced.
X-Git-Tag: 1.6.0~42
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b8cfe2b39030d518c45b4a2e68c7376ea66cab17;p=nageru

Fix an assertion failure when moving an input from non-interlacing to interlaced.
---

diff --git a/theme.cpp b/theme.cpp
index 56e7ce2..ec791d3 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -792,18 +792,18 @@ void LiveInputWrapper::connect_signal_raw(int signal_num)
 		case bmusb::PixelFormat_8BitYCbCr:
 			ycbcr_inputs[i]->set_texture_num(0, userdata->tex_y[frame.field_number]);
 			ycbcr_inputs[i]->set_texture_num(1, userdata->tex_cbcr[frame.field_number]);
-			ycbcr_inputs[i]->set_width(this_width);
-			ycbcr_inputs[i]->set_height(this_height);
+			ycbcr_inputs[i]->set_width(width);
+			ycbcr_inputs[i]->set_height(height);
 			break;
 		case bmusb::PixelFormat_10BitYCbCr:
 			ycbcr_inputs[i]->set_texture_num(0, userdata->tex_444[frame.field_number]);
-			ycbcr_inputs[i]->set_width(this_width);
-			ycbcr_inputs[i]->set_height(this_height);
+			ycbcr_inputs[i]->set_width(width);
+			ycbcr_inputs[i]->set_height(height);
 			break;
 		case bmusb::PixelFormat_8BitBGRA:
 			rgba_inputs[i]->set_texture_num(userdata->tex_rgba[frame.field_number]);
-			rgba_inputs[i]->set_width(this_width);
-			rgba_inputs[i]->set_height(this_height);
+			rgba_inputs[i]->set_width(width);
+			rgba_inputs[i]->set_height(height);
 			break;
 		default:
 			assert(false);