Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: aa5f8e9a65
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-15 18:40:47 +01:00
8 changed files with 359 additions and 228 deletions

View File

@@ -267,6 +267,11 @@ max res 1920x1080
return 0; /* dont fail because of this */
}
fb_pixel_t * CFbAccelCSHD2::getBackBufferPointer() const
{
return backbuffer;
}
void CFbAccelCSHD2::setBlendMode(uint8_t mode)
{
if (ioctl(fd, FBIO_SETBLENDMODE, mode))