sync with seife

This commit is contained in:
martii
2013-02-24 20:13:12 +01:00
11 changed files with 126 additions and 154 deletions

View File

@@ -1,10 +1,10 @@
/*
* (C) 2002-2003 Andreas Oberritter <obi@tuxbox.org>
* (C) 2010-2011 Stefan Seyfried
* (C) 2010-2013 Stefan Seyfried
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <fcntl.h>
@@ -499,9 +498,6 @@ int cVideo::getBlank(void)
size_t n = 0;
ssize_t r;
char *line = NULL;
#ifndef MARTII
char *p;
#endif
/* hack: the "mailbox" irq is not increasing if
* no audio or video is decoded... */
FILE *f = fopen("/proc/interrupts", "r");