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

Build fix for non-ffmpeg and non-gcc non-++11.

Browse source
This commit is contained in:
Sacha 2013-06-12 10:51:30 +10:00
parent 052a15b788
commit 5aba914a42
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/HW/MediaEngine.cpp
View file

@ -417,8 +417,8 @@ bool MediaEngine::stepVideo(int videoPixelMode) {
int MediaEngine::writeVideoImage(u8* buffer, int frameWidth, int videoPixelMode) {
if ((!m_pFrame)||(!m_pFrameRGB))
return false;
int videoImageSize = 0;
#ifdef USE_FFMPEG
int videoImageSize = 0;
// lock the image size
int height = m_desHeight;
int width = m_desWidth;
@ -470,16 +470,17 @@ int MediaEngine::writeVideoImage(u8* buffer, int frameWidth, int videoPixelMode)
ERROR_LOG(ME, "Unsupported video pixel format %d", videoPixelMode);
break;
}
#endif // USE_FFMPEG
return videoImageSize;
#endif // USE_FFMPEG
return true;
}
int MediaEngine::writeVideoImageWithRange(u8* buffer, int frameWidth, int videoPixelMode,
int xpos, int ypos, int width, int height) {
if ((!m_pFrame)||(!m_pFrameRGB))
return false;
int videoImageSize = 0;
#ifdef USE_FFMPEG
int videoImageSize = 0;
// lock the image size
u8 *imgbuf = buffer;
u8 *data = m_pFrameRGB->data[0];
@ -540,8 +541,9 @@ int MediaEngine::writeVideoImageWithRange(u8* buffer, int frameWidth, int videoP
ERROR_LOG(ME, "Unsupported video pixel format %d", videoPixelMode);
break;
}
#endif // USE_FFMPEG
return videoImageSize;
#endif // USE_FFMPEG
return true;
}
static bool isHeader(u8* audioStream, int offset)

4
Core/Util/PPGeDraw.cpp
View file

@ -518,9 +518,9 @@ void PPGeDrawCurrentText(u32 color)
{
float scale = char_lines_metrics.scale;
BeginVertexData();
for (auto i = char_lines.cbegin(); i != char_lines.cend(); ++i)
for (auto i = char_lines.begin(); i != char_lines.end(); ++i)
{
for (auto j = i->cbegin(); j != i->cend(); ++j)
for (auto j = i->begin(); j != i->end(); ++j)
{
float cx1 = j->x;
float cy1 = j->y;