From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 17 Nov 2015 18:53:55 +0000 (+0100)
Subject: Fix a hard-coded offset constant.
X-Git-Tag: 1.0.0~103
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=039f2cda6a822cd4b95039ce389577e34b539e52;p=nageru

Fix a hard-coded offset constant.
---

diff --git a/mixer.cpp b/mixer.cpp
index be28478..7a084d9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -336,11 +336,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	// Upload the textures.
 	glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
 	check_error();
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + 22));
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + video_offset/2));
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
 	check_error();
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + 22));
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + video_offset/2));
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, 0);
 	check_error();