Jacek Jendrzej 6dccf588af fix merge error ...

Origin commit data
------------------
Branch: master
Commit: 0b9575ff7f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-14 (Tue, 14 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

2017-11-14 15:13:13 +01:00

..

audio_lib.h

armbox: remove audiomixers

2017-10-07 23:02:24 +02:00

audio_mixer.cpp

adding armbox

2017-09-12 16:10:27 +02:00

audio_mixer.h

adding armbox

2017-09-12 16:10:27 +02:00

audio.cpp

armbox: fix audio playback #2

2017-10-27 22:40:16 +02:00

cs_api.h

armbox: add dvbci (thx DboxOldie)

2017-11-05 16:02:44 +01:00

dmx_cs.h

adding armbox

2017-09-12 16:10:27 +02:00

dmx_lib.h

adding armbox

2017-09-12 16:10:27 +02:00

dmx.cpp

armbox: remove dead code from cDemux

2017-10-07 21:04:31 +02:00

hardware_caps.c

add display_has_statusline member

2017-11-14 09:43:22 +01:00

init_cs.h

adding armbox

2017-09-12 16:10:27 +02:00

init_lib.h

adding armbox

2017-09-12 16:10:27 +02:00

init.cpp

armbox: fullscreen osd ;)

2017-10-31 09:55:45 +01:00

linux-uapi-cec.h

armbox add missing header file

2017-10-17 18:39:10 +02:00

Makefile.am

gstreamer playback - get real apid from TS

2017-11-01 00:25:04 +01:00

playback_gst.cpp

fix merge error

2017-11-14 15:13:13 +01:00

playback_gst.h

armbox: fix gst playback

2017-10-22 10:46:57 +02:00

pwrmngr.cpp

adding armbox

2017-09-12 16:10:27 +02:00

pwrmngr.h

adding armbox

2017-09-12 16:10:27 +02:00

record_lib.h

adding armbox

2017-09-12 16:10:27 +02:00

record.cpp

adding armbox

2017-09-12 16:10:27 +02:00

video_lib.h

armbox: improve cec

2017-10-19 21:39:55 +02:00

video.cpp

armbox: tryfix cec

2017-11-05 14:25:01 +01:00