Merge branch 'master' of https://github.com/hrydgard/ppsspp into DiscDirectory

Conflicts:
	Windows/ppsspp.rc
	Windows/resource.h
This commit is contained in:
Kingcom committed 2013-07-25 13:49:53 +02:00
commit cedb41a10c
11 files changed
+67 -19

No files matched your search

+4 -3
View File
@@ -392,9 +392,10 @@ u32 sceMpegCreate(u32 mpegAddr, u32 dataPtr, u32 size, u32 ringbufferAddr, u32 f
Memory::Memcpy(mpegHandle, "LIBMPEG.001", 12);
Memory::Write_U32(-1, mpegHandle + 12);
Memory::Write_U32(ringbufferAddr, mpegHandle + 16);
Memory::Write_U32(ringbuffer.dataUpperBound, mpegHandle + 20);
if (ringbufferAddr){
Memory::Write_U32(ringbufferAddr, mpegHandle + 16);
Memory::Write_U32(ringbuffer.dataUpperBound, mpegHandle + 20);
}
MpegContext *ctx = new MpegContext;
mpegMap[mpegHandle] = ctx;
lastMpegHandle = mpegHandle;
+1 -1
View File
@@ -306,7 +306,7 @@ int sceNetEtherNtostr(const char *mac, u32 bufferPtr) {
DEBUG_LOG(HLE, "UNTESTED sceNetEtherNtostr(%s, %x)", mac, bufferPtr);
if(Memory::IsValidAddress(bufferPtr)) {
size_t len = strlen(mac);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
Memory::Write_U8(mac[i], bufferPtr + i);
}
else