Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix for non-ffmpeg platforms. Thanks unknownbrackets!

Browse source 
Can now get past videos on platforms such as Meego and Symbian.
Also fix some spacing and type issues.
This commit is contained in:
Sacha 2013-06-19 01:14:14 +10:00
parent f30983ce00
commit 45775d4fc2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/ArmCPUDetect.cpp
View file

@ -128,8 +128,8 @@ void CPUInfo::Detect()
// Get the information about the CPU
num_cores = GetCoreCount();
#if defined(__SYMBIAN32__) || defined(BLACKBERRY) || defined(IOS)
bool isVFP3 = false;
bool isVFP4 = false;
bool isVFP3 = false;
bool isVFP4 = false;
#ifdef IOS
isVFP3 = true;
// TODO: Check for swift arch (VFP4)

10
Core/HW/MediaEngine.cpp
View file

@ -369,13 +369,13 @@ void MediaEngine::updateSwsFormat(int videoPixelMode) {
}
bool MediaEngine::stepVideo(int videoPixelMode) {
// if video engine is broken, force to add timestamp
m_videopts += 3003;
if (!m_pFormatCtx)
return false;
if (!m_pCodecCtx)
return false;
// if video engine is broken, force to add timestamp
m_videopts += 3003;
#ifdef USE_FFMPEG
updateSwsFormat(videoPixelMode);
// TODO: Technically we could set this to frameWidth instead of m_desWidth for better perf.
@ -525,7 +525,7 @@ int MediaEngine::writeVideoImage(u8* buffer, int frameWidth, int videoPixelMode)
}
return videoImageSize;
#endif // USE_FFMPEG
return true;
return 0;
}
int MediaEngine::writeVideoImageWithRange(u8* buffer, int frameWidth, int videoPixelMode,
@ -590,7 +590,7 @@ int MediaEngine::writeVideoImageWithRange(u8* buffer, int frameWidth, int videoP
}
return videoImageSize;
#endif // USE_FFMPEG
return true;
return 0;
}
static bool isHeader(u8* audioStream, int offset)