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

Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)
This commit is contained in:
vanhofen
2017-10-13 14:13:22 +02:00
5 changed files with 21 additions and 9 deletions

View File

@@ -666,7 +666,7 @@ void CInfoViewerBB::showIcon_Resolution()
videoDecoder->getPictureInfo(xres, yres, framerate);
if (yres > 1088)
icon_name = NEUTRINO_ICON_RESOLUTION_UHD;
else if (yres > 576)
else if (yres > 704)
icon_name = NEUTRINO_ICON_RESOLUTION_HD;
else if (yres > 0)
icon_name = NEUTRINO_ICON_RESOLUTION_SD;