Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: d894829c43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-19 23:35:31 +01:00
9 changed files with 43 additions and 49 deletions

View File

@@ -129,7 +129,7 @@ class CFbAccelCSHD2
fb_pixel_t * getBackBufferPointer() const;
void setBlendMode(uint8_t);
void setBlendLevel(int);
int scaleFont(int size);
int scale2Res(int size);
bool fullHdAvailable();
void setOsdResolutions();
uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true);