diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index 8f94abbba..cfb9fae2c 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1138,10 +1138,13 @@ static inline boolean saveTGA(const char *file_name, void *buffer,
 
 UINT8 *HWR_GetScreenshot(void)
 {
-	UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf));
+	static UINT8 *buf = NULL;
+
+	buf = realloc(buf, vid.width * vid.height * 3);
 
 	if (!buf)
 		return NULL;
+
 	// returns 24bit 888 RGB
 	HWD.pfnReadRect(0, 0, vid.width, vid.height, vid.width * 3, (void *)buf);
 	return buf;
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 8071f030d..744651319 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -465,19 +465,23 @@ static size_t gifframe_size = 8192;
 static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
 {
 	UINT8 r, g, b;
-	size_t src = 0, dest = 0;
-	size_t size = (vid.width * vid.height * 3);
+	size_t src, dest;
+	int x, y;
 
 	InitColorLUT();
 
-	while (src < size)
+	for (x = 0; x < vid.width; x += scrbuf_downscaleamt)
 	{
-		r = (UINT8)linear[src];
-		g = (UINT8)linear[src + 1];
-		b = (UINT8)linear[src + 2];
-		scr[dest] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
-		src += (3 * scrbuf_downscaleamt);
-		dest += scrbuf_downscaleamt;
+		for (y = 0; y < vid.height; y += scrbuf_downscaleamt)
+		{
+			dest = y*vid.width + x;
+			src = dest*3;
+
+			r = (UINT8)linear[src];
+			g = (UINT8)linear[src + 1];
+			b = (UINT8)linear[src + 2];
+			scr[dest] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+		}
 	}
 }
 #endif
@@ -514,7 +518,7 @@ static void GIF_framewrite(void)
 		{
 			UINT8 *linear = HWR_GetScreenshot();
 			GIF_rgbconvert(linear, movie_screen);
-			free(linear);
+			//free(linear); // Allocated 'statically', no need to free now
 		}
 #endif
 	}
@@ -530,7 +534,7 @@ static void GIF_framewrite(void)
 		{
 			UINT8 *linear = HWR_GetScreenshot();
 			GIF_rgbconvert(linear, screens[0]);
-			free(linear);
+			//free(linear); // Allocated 'statically', no need to free now
 		}
 #endif