ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:snes9xgit/snes9x

This commit is contained in:
Brandon Wright 2016-10-02 19:42:31 -05:00
parent 17f83a0806 b3b31b1d26
commit 920cd52a4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unix/x11.cpp
View File

@ -1415,18 +1415,18 @@ void S9xPutImage (int width, int height)
}
}
// Change the image height if we are in maxaspect mode
if (GUI.maxaspect && GUI.fullscreen)
#ifdef USE_XVIDEO
// Adjust source blit region if SNES would only fill half the screen.
if (height <= SNES_HEIGHT_EXTENDED)
GUI.imageHeight = height * 2;
#ifdef USE_XVIDEO
if (GUI.use_xvideo && (GUI.xv_format == FOURCC_YUY2))
{
uint16 *s = (uint16 *)GUI.blit_screen;
uint8 *d = (uint8 *)GUI.image->data;
// convert GUI.blit_screen and copy to XV image
for (int y = 0; y < SNES_HEIGHT_EXTENDED * 2; y++)
for (int y = 0; y < copyHeight; y++)
{
for (int x = 0; x < SNES_WIDTH * 2; x += 2)
{