Commit Graph

288 Commits

Author SHA1 Message Date
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
36741264b0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 11:49:05 +01:00
vanhofen
6d09df76e6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5dee22b19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 21:40:11 +01:00
Thilo Graf
410921eb9e CRecordManager: use default timeout from settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: b273334f46
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-09 (Fri, 09 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 21:37:17 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
c72aac7588 record.cpp: avoid segfault in CRecordManager::getUseCI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c12ed7ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- record.cpp: avoid segfault in CRecordManager::getUseCI()

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

------------------
This commit was generated by Migit
2016-11-16 00:49:45 +01:00
Thilo Graf
b31f96a58c Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4f94a8964
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-13 16:04:39 +01:00
vanhofen
531b7b2cc0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-13 01:48:39 +01:00
Stefan Seyfried
9da0bb35b9 driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:44:45 +01:00
vanhofen
30bd7aa4cc Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:34:20 +01:00
Stefan Seyfried
8a0cebc9fc driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-12 22:16:42 +01:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
74b278d191 driver/record: make CStreamRec non-public
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5cb683048
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:45:46 +02:00
Stefan Seyfried
1df6d63abc record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bf115db80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:45:23 +02:00
Stefan Seyfried
c84777c475 driver/record: make CStreamRec non-public
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b8e44c3717
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 12:08:57 +02:00
Stefan Seyfried
6abba22cdc record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f33ee96fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 12:02:10 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
019b1957d8 movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8321b6558
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
d37b874b32 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 802b4bc792
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
b268f07bee movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: b758f4c69d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
5a6975c353 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc831c545c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
6ffb11d1b9 movieinfo: internally rename epgVTXPID -> VtxtPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57cbc3fad6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
16766b79bc movieinfo: internally rename epgVideoPid -> VideoPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2358a58a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
08ebb55b95 movieinfo: internally rename epgMode -> mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3da12ccc9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
fcd0467caf movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
db37495d47 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
525688ef8a movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
9e5c1f0439 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
90a9e96ab7 movieinfo: internally rename epgVTXPID -> VtxtPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1feaad8fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
0bdf75c94d movieinfo: internally rename epgVideoPid -> VideoPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb566eba5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
cc4ad85976 movieinfo: internally rename epgMode -> mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c37abc0a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
2e2f2ed596 movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53c6a23d07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-09 22:01:34 +02:00
vanhofen
14da305c05 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

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

------------------
This commit was generated by Migit
2016-09-09 19:43:00 +02:00
vanhofen
3c4951ef07 movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbcbf06560
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-09 19:33:04 +02:00
vanhofen
a2d8224109 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-09 18:58:11 +02:00
vanhofen
be6d660d8d movieinfo: internally rename epgVTXPID -> VtxtPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d3bf56158
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid

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

------------------
This commit was generated by Migit
2016-09-09 18:50:18 +02:00
vanhofen
43afc6d9f8 movieinfo: internally rename epgVideoPid -> VideoPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fa9e392af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid

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

------------------
This commit was generated by Migit
2016-09-09 18:45:07 +02:00
vanhofen
c591b7cc0d movieinfo: internally rename epgMode -> mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93d882dc96
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode

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

------------------
This commit was generated by Migit
2016-09-09 18:42:14 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
FlatTV
fbab44c8c6 channellist: set CI channel inactive if recording with CI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 570d1b10f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-25 (Sat, 25 Jun 2016)


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

------------------
This commit was generated by Migit
2016-06-25 13:06:12 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
d4334efc13 some compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8638cd73b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-22 16:46:21 +02:00
Jacek Jendrzej
9a77db4fb1 add av_dict_free, fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: a830d0d587
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-04 (Mon, 04 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-04 15:38:51 +02:00
Jacek Jendrzej
9ce2437cd4 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name';
Origin commit data
------------------
Branch: ni/coolstream
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-25 17:16:54 +01:00