mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 10:51:05 +02:00
Merge branch 'master', remote-tracking branch 'origin' into dvbsi++
Origin commit data
------------------
Commit: f3d2895847
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
This commit is contained in:
@@ -78,7 +78,8 @@ bool CScreenShot::GetData()
|
||||
#ifdef USE_NEVIS_GXA
|
||||
CFrameBuffer::getInstance()->setActive(false);
|
||||
#endif
|
||||
|
||||
if (videoDecoder->getBlank())
|
||||
get_video = false;
|
||||
#if 1 // to enable after libcs/drivers update
|
||||
res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user