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-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

mipsbox/hdmi-cec: fix viral merge error

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 19d5dc6aa1
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-02 (Tue, 02 Feb 2021)

Origin message was:
------------------
- mipsbox/hdmi-cec: fix viral merge error

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-02-02 10:23:42 +01:00
committed by GitHub
parent 0ca16775d9
commit 59e0e3373b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmipsbox/hdmi_cec.cpp
View File

@@ -594,15 +594,9 @@ void hdmi_cec::run()
struct epoll_event event;
event.data.fd = hdmiFd;
event.events = EPOLLIN;
<<<<<<< HEAD
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
=======
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
>>>>>>> e24aae1... cec volume switch audiosystem/tv
std::array<struct epoll_event, EPOLL_MAX_EVENTS> events;
while (running)