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

Merge remote-tracking branch 'tangocash/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 730b2dfb3f
Author: max_10 <max_10@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-10-05 19:26:50 +02:00
parent 8defaa6cca f8dbeff850
commit b991cbf884
5 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libarmbox/video.cpp
View File

@@ -200,7 +200,7 @@ void cVideo::openDevice(void)
if (fd != -1) /* already open */
return;
retry:
if ((fd = open(VDEV[devnum], O_RDWR|O_CLOEXEC)) < 0)
if ((fd = open(VDEV[devnum], O_RDWR|O_CLOEXEC|O_NONBLOCK)) < 0)
{
if (errno == EBUSY)
{
@@ -359,6 +359,10 @@ int cVideo::GetVideoSystem()
"1080p60", // VIDEO_STD_1080P60
"1080p2397", // VIDEO_STD_1080P2397
"1080p2997", // VIDEO_STD_1080P2997
"2160p24", //VIDEO_STD_2160P24
"2160p25", // VIDEO_STD_2160P25
"2160p30", // VIDEO_STD_2160P30
"2160p50", // VIDEO_STD_2160P50
"720p50" // VIDEO_STD_AUTO
};