mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Merge branch 'master' into pu/fb-setmode
Fix merge conflict
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user