Merge branch 'master' into pu/fb-setmode

Fix merge conflict
This commit is contained in:
M. Liebmann
2017-02-14 20:11:08 +01:00
9 changed files with 40 additions and 15 deletions

View File

@@ -131,6 +131,8 @@ class CFbAccelCSHD2
int scaleFont(int size);
bool fullHdAvailable();
void setOsdResolutions();
uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true);
bool needAlign4Blit() { return true; };
};
class CFbAccelGLFB