aboutsummaryrefslogtreecommitdiff
path: root/plugins/cdrcimg
diff options
context:
space:
mode:
authorretro-wertz2019-03-13 09:22:23 +0800
committerretro-wertz2019-03-13 09:23:56 +0800
commit1bedbd6f272bd83af54c80eb0089ae1d6f4561a2 (patch)
tree03e541dd603cafb9961d3579f741c879d21bc29d /plugins/cdrcimg
parent5a49b8a2620bfdfaaf59ae25aa51bde44610371b (diff)
parent8a55ebcc07d4f860633db8c77bb9e16bcfa03313 (diff)
downloadpcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.tar.gz
pcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.tar.bz2
pcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.zip
merge remote-tracking branch 'notaz/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 45016bb..f1e0777 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 uncomp2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+static int uncompress2_pcsx(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 = uncomp2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+ ret = uncompress2_pcsx(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
break;
case CDRC_BZ:
ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,