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

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
This commit is contained in:
vanhofen
2017-02-28 15:36:23 +01:00
parent 5173230337 84759d6c05
commit f5d9d25957
21 changed files with 310 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -215,11 +215,13 @@ void CFbAccelCSHD2::setOsdResolutions()
res.xRes = 1280;
res.yRes = 720;
res.bpp = 32;
res.mode = OSDMODE_720;
osd_resolutions.push_back(res);
if (fullHdAvailable()) {
res.xRes = 1920;
res.yRes = 1080;
res.bpp = 32;
res.mode = OSDMODE_1080;
osd_resolutions.push_back(res);
}
}