mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user