vanhofen 6df51f5e7e fix last merge ...

Origin commit data
------------------
Commit: 4e3193a126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- fix last merge

2017-02-12 23:58:55 +01:00

..

audiodec

driver: use newer ffmpeg API

2016-11-13 01:44:45 +01:00

pictureviewer

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

abstime.c

…

abstime.h

…

audiofile.cpp

…

audiofile.h

…

audiometadata.cpp

src/driver/audiometadata.cpp init cover_temporary

2017-02-10 20:33:28 +01:00

audiometadata.h

…

audioplay.cpp

set useful thread names for all spawned threads

2017-02-12 22:55:36 +01:00

audioplay.h

…

colorgradient.cpp

fix possible segfault and negative height

2016-10-31 15:53:29 +01:00

colorgradient.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

display.h

…

fade.cpp

Merge branch 'master' into pu/fb-modules

2017-02-12 09:24:08 +01:00

fade.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

fb_accel_cs_hd1.cpp

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-09 20:22:37 +01:00

fb_accel_cs_hd2.cpp

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-08 20:38:28 +01:00

fb_accel_cs_hdx_inc.h

fb_accel_cs_hdx_inc.h: remove unused includes

2017-02-08 20:16:07 +01:00

fb_accel_cs.cpp

fb_accel: add accelerated framebuffer for Nevis GXA chips

2017-02-05 23:03:22 +01:00

fb_accel_glfb.cpp

fix build; try to port our framebuffer changes (need fixes!)

2017-02-08 09:45:53 +01:00

fb_accel_sti.cpp

framebuffer: add accelerator for STi framebuffer

2017-02-07 17:23:42 +01:00

fb_accel_td.cpp

fb_accel_td: implement setBlendMode/Level

2017-02-12 22:49:14 +01:00

fb_accel.cpp

framebuffer: add accelerator for STi framebuffer

2017-02-07 17:23:42 +01:00

fb_accel.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

fb_generic.cpp

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

2017-02-12 23:50:14 +01:00

fb_generic.h

fix last merge

2017-02-12 23:58:55 +01:00

fb_window.cpp

Merge remote-tracking branch 'tuxbox/master'

2016-10-22 11:37:40 +02:00

fb_window.h

replace fontrenderer.h include with forward declaration

2017-02-07 17:23:42 +01:00

fbaccel.cpp

more rename hardware defined macros for coolstream stb

2017-02-12 22:21:18 +01:00

fbaccel.h

framebuffer/fbaccel: merge NI code

2016-08-26 23:13:52 +02:00

file.cpp

…

file.h

…

fontrenderer.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-10 00:44:57 +01:00

fontrenderer.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

framebuffer_ng.cpp

more rename hardware defined macros for coolstream stb

2017-02-12 22:21:18 +01:00

framebuffer_ng.h

framebuffer_ng: implement getIconPath

2016-10-22 11:46:34 +02:00

framebuffer.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-12 21:54:48 +01:00

framebuffer.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-09 13:19:03 +01:00

genpsi.cpp

…

genpsi.h

…

lcdd.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

lcdd.h

…

Makefile.am

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

moviecut.cpp

CMsgBox: rework msgbox classes with Window class implementation

2016-10-24 10:31:24 +02:00

moviecut.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

netfile.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

netfile.h

…

neutrinofonts.cpp

rename screen_x/yres to font_scaling_x/y

2017-02-09 18:13:19 +01:00

neutrinofonts.h

neutrinofonts: fix -Wnarrowing warning in osd_setup

2016-09-29 10:53:06 +02:00

newclock.cpp

…

newclock.h

…

radiotext.cpp

…

radiotext.h

replace fontrenderer.h include with forward declaration

2017-02-07 17:23:42 +01:00

radiotools.cpp

…

radiotools.h

…

rcinput.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-01-22 22:59:39 +01:00

rcinput.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

record.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-02 13:13:34 +01:00

record.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-09 13:19:03 +01:00

scanepg.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

scanepg.h

…

screen_max.cpp

…

screen_max.h

…

screenshot.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

screenshot.h

…

shutdown_count.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

shutdown_count.h

…

simple_display.cpp

set useful thread names for all spawned threads

2017-02-12 15:17:32 +01:00

spark_led.h

…

stacktrace.h

Adapt neutrino-mp for CST hardware part #1

2016-01-16 07:26:04 +01:00

streamts.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 23:04:09 +01:00

streamts.h

driver/record.cpp, driver/streamts.cpp: add more formats, for testing

2016-03-12 14:53:11 +03:00

vfd.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

vfd.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-12 22:17:17 +01:00

volume.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-02-01 22:03:40 +01:00

volume.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

wav.h

…