From b90c64c456c1bdebd8bb49e357ca955a9f8b5db1 Mon Sep 17 00:00:00 2001
From: Melissa Goad <alegend45@gmail.com>
Date: Thu, 26 Apr 2018 10:42:05 -0500
Subject: [PATCH] Remove conflicts

---
 src/video/vid_svga.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index da148849a..2fca45358 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -796,7 +796,7 @@ svga_init(svga_t *svga, void *p, int memsize,
     svga->vram_max = memsize;
     svga->vram_display_mask = svga->vram_mask = memsize - 1;
     svga->decode_mask = 0x7fffff;
-    svga->changedvram = malloc(memsize >> 12);
+    svga->changedvram = malloc(0x800000 >> 12);
     svga->recalctimings_ex = recalctimings_ex;
     svga->video_in  = video_in;
     svga->video_out = video_out;