aboutsummaryrefslogtreecommitdiff
path: root/plugins/cdrcimg
diff options
context:
space:
mode:
authormeepingsnesroms2017-04-07 09:12:17 -0700
committerGitHub2017-04-07 09:12:17 -0700
commitf69f94c063891f2bfc95f35f524037f30b5bcc64 (patch)
tree4af761aba62b81d1e0b36809d2a8d7a8beed86aa /plugins/cdrcimg
parent726da67c8bd8163a9b5a67f36c7e715f021df7df (diff)
parentd9e770393ef9f049a40e34c06b12f0e3435dce46 (diff)
downloadpcsx_rearmed-f69f94c063891f2bfc95f35f524037f30b5bcc64.tar.gz
pcsx_rearmed-f69f94c063891f2bfc95f35f524037f30b5bcc64.tar.bz2
pcsx_rearmed-f69f94c063891f2bfc95f35f524037f30b5bcc64.zip
Merge pull request #1 from libretro/master
update from master
Diffstat (limited to 'plugins/cdrcimg')
-rw-r--r--plugins/cdrcimg/cdrcimg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 47371aa..45016bb 100644
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -100,7 +100,7 @@ static long CDRgetTD(unsigned char track, unsigned char *buffer)
return 0;
}
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+int uncomp2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
{
static z_stream z;
int ret = 0;
@@ -201,7 +201,7 @@ static long CDRreadTrack(unsigned char *time)
ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
break;
case CDRC_ZLIB2:
- ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+ ret = uncomp2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
break;
case CDRC_BZ:
ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,