From 96c3d6cc1d9d48e1776a1def9837acdc7a716ef2 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sun, 1 Oct 2017 13:10:24 -0700
Subject: [PATCH 1/2] Remove debug abort() left in by accident

---
 libretro-common/streams/chd_stream.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libretro-common/streams/chd_stream.c b/libretro-common/streams/chd_stream.c
index 1c569cf17b..94c1e22329 100644
--- a/libretro-common/streams/chd_stream.c
+++ b/libretro-common/streams/chd_stream.c
@@ -346,7 +346,6 @@ ssize_t chdstream_read(chdstream_t *stream, void *data, size_t bytes)
 
          if (!chdstream_load_hunk(stream, hunk))
          {
-            abort();
             return -1;
          }
          memcpy(out + data_offset,

From 1aff508ae5dde1989c72e9105325433748ebfc52 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sun, 1 Oct 2017 13:22:17 -0700
Subject: [PATCH 2/2] Update CHANGES

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index a12113b96d..9a952bacf5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,8 @@
 - WII: Use custom, embedded libogc SDK.
 - WIIU: Initial touchscreen support for WiiU gamepad.
 - SCANNER: Fix archive scanning.
+- SCANNER: Support CHD files.
+- SCANNER: Use primary data track of disc images for CRC lookups rather than cue files.  This is slower but finds matches more reliably, and is necessary for CHD files to work at all.  Update your databases!
 
 # 1.6.7
 - SCANNER: Fix directory scanning.