Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: dc542ba151
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-17 (Sat, 17 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-17 15:06:49 +02:00

View File

@@ -156,17 +156,10 @@ int COsdHelpers::isVideoSystem1080(int res)
return false;
}
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
int COsdHelpers::getVideoSystem()
{
return videoDecoder->GetVideoSystem();
}
#else
int COsdHelpers::getVideoSystem()
{
return g_settings.video_Mode;
}
#endif
uint32_t COsdHelpers::getOsdResolution()
{