mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-10 15:18:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit d7a2395633

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)
This commit is contained in:
Stefan Seyfried
2013-01-03 09:46:11 +01:00
parent 8d8547d983 d7a2395633
commit 398f17e65a
14 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/framebuffer.h
View File

@@ -34,6 +34,8 @@
#include <string>
#include <map>
#include <OpenThreads/Mutex>
#include <OpenThreads/ScopedLock>
#define fb_pixel_t uint32_t
@@ -66,6 +68,7 @@ class CFrameBuffer
private:
CFrameBuffer();
OpenThreads::Mutex mutex;
struct rgbData
{