mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Fix merge conflict


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



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-14 20:11:08 +01:00
parent ed768d2c33 c940801136
commit 78a5a4a658
9 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fb_accel.h
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