Commit Graph

127 Commits

Author SHA1 Message Date
Jacek Jendrzej
4afe07378f ffmpeg compil versions warnnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcb392908b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2021-10-27 (Wed, 27 Oct 2021)


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

------------------
This commit was generated by Migit
2021-10-27 21:28:50 +02:00
vanhofen
4de9f5c45c configure: depending --enable-quadpip on --enable-pip
* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 866ababb79
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-16 (Sat, 16 Oct 2021)

Origin message was:
------------------
- configure: depending --enable-quadpip on --enable-pip

* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines


------------------
This commit was generated by Migit
2021-10-16 22:08:35 +02:00
vanhofen
ba26796925 unify AV_VERSION_INT defines; fix cst build
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1ff68dc54
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-08-29 (Sun, 29 Aug 2021)

Origin message was:
------------------
- unify AV_VERSION_INT defines; fix cst build

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

------------------
This commit was generated by Migit
2021-08-29 19:22:49 +02:00
Frankenstone
19d192a9c0 unnecessary brackets removed
- distinction ffmpeg versions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 00885fda4a
Author: Frankenstone <dampf_acc@online.de>
Date: 2021-05-17 (Mon, 17 May 2021)



------------------
This commit was generated by Migit
2021-05-17 22:28:02 +02:00
Hendi
eca36328b6 record/streamts: lower bsf libavcodec check to 57.48.100 (#10)
The bit stream filter change was done in ffmpeg 3.1 already.

Origin commit data
------------------
Branch: ni/coolstream
Commit: 91e3f9e51a
Author: Hendi <hendi48@freenet.de>
Date: 2021-05-09 (Sun, 09 May 2021)



------------------
This commit was generated by Migit
2021-05-09 21:04:09 +02:00
TangoCash
b1a849f08e fix record/stream AC3 logic
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34d8244a80
Author: TangoCash <eric@loxat.de>
Date: 2021-04-04 (Sun, 04 Apr 2021)


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

------------------
This commit was generated by Migit
2021-04-04 22:05:41 +02:00
DboxOldie
f5a22100b4 generate correct camask
Origin commit data
------------------
Branch: ni/coolstream
Commit: 814cc525b1
Author: DboxOldie <DboxOdlie@users.noreply.github.com>
Date: 2021-01-23 (Sat, 23 Jan 2021)


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

------------------
This commit was generated by Migit
2021-01-23 23:18:06 +01:00
Jacek Jendrzej
8146467dd8 streamts.cpp and record.cpp: fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: d46fc58eb4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-13 (Mon, 13 Jan 2020)


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

------------------
This commit was generated by Migit
2020-01-13 17:19:28 +01:00
Jacek Jendrzej
5e9067d974 movieplayer arm: add option to play separate audio file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47914fbdc5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-11-03 (Sun, 03 Nov 2019)


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

------------------
This commit was generated by Migit
2019-11-03 20:21:28 +01:00
Jacek Jendrzej
36369bd805 api ffmpeg, renamed hls format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fea61e3a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-07-17 (Wed, 17 Jul 2019)


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

------------------
This commit was generated by Migit
2019-07-17 19:27:27 +02:00
Jacek Jendrzej
67b47c0a36 streamts: supplement to 086578fdb2a0133953b98171106699e8b04da8ea
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ba59a7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-17 (Fri, 17 May 2019)


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

------------------
This commit was generated by Migit
2019-05-17 22:29:19 +02:00
FlatTV
c6b40db080 streamts.cpp: pick ARM streaming from DDT (thx DboxOldie)
Origin commit data
------------------
Branch: ni/coolstream
Commit: edb5fa95ee
Author: FlatTV <FlatTV@gmx.de>
Date: 2019-05-05 (Sun, 05 May 2019)


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

------------------
This commit was generated by Migit
2019-05-05 17:05:37 +02:00
max_10
a55b0dd9cf fix aac audio when streaming, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: da944aa9bf
Author: max_10 <max_10@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)

Origin message was:
------------------
- fix aac audio when streaming, thx DboxOldie

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

------------------
This commit was generated by Migit
2019-05-03 21:39:42 +02:00
Frankenstone
18579fd9b7 reduce ffmpeg warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: b160f48143
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-01 (Fri, 01 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-01 18:34:51 +01:00
Frankenstone
244d1d9447 fix ffmpeg compiler warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-27 23:25:44 +01:00
vanhofen
774b23685e move compatibility headers to /lib/hardware
Origin commit data
------------------
Branch: ni/coolstream
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware

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

------------------
This commit was generated by Migit
2018-12-21 22:30:34 +01:00
vanhofen
a0cce78210 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)



------------------
This commit was generated by Migit
2017-11-28 10:31:10 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
31716245ba Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:55:53 +02:00
Stefan Seyfried
f889b88c73 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-26 12:58:44 +02:00
Jacek Jendrzej
a916fad179 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf951434d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-20 (Tue, 20 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-20 14:26:38 +02:00
vanhofen
1f5b252c74 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-19 23:08:41 +02:00
vanhofen
a42a4e3777 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3575c5f397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 23:00:29 +02:00
Jacek Jendrzej
17b08e16ba try to fix versio check for ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bc31c6397
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 21:43:34 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
Stefan Seyfried
b06b9394b7 set threadnames to unique values
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5307e62506
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 14:17:12 +02:00
Stefan Seyfried
5b78fe01f1 set threadnames to unique values
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e0544cd94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)


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

------------------
This commit was generated by Migit
2017-06-03 14:54:49 +02:00
vanhofen
6850970ff1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 23:24:19 +02:00
vanhofen
cd653ca806 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 21:35:56 +02:00
vanhofen
1b8ea4a94d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 21:29:41 +02:00
Jacek Jendrzej
fee0463182 try to fix version check for avformat codecpar
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bf23d9c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 17:19:43 +02:00
vanhofen
26e23762ca Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:45:02 +01:00
Jacek Jendrzej
55a2b807b5 try fix segfault with --enable-cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76530e2c05
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 19:13:37 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
b67a4fc3b3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Stefan Seyfried
587fa7d77a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 19:43:06 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +01:00
vanhofen
ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 23:04:09 +01:00
vanhofen
6e85f1b0ca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 23:01:15 +01:00
Stefan Seyfried
6f1ae25be5 streamts: don't overflow receive buffer, better diag message
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff0d98bcc3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 22:58:58 +01:00
Stefan Seyfried
0c2a23bb22 streamts: don't overflow receive buffer, better diag message
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec3201ab04
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 16:56:10 +01:00
Stefan Seyfried
9c4e164a5c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f397d08cd3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-29 02:14:32 +01:00
vanhofen
f70f7df777 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:24 +01:00
vanhofen
f9a197c97e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad8496e24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)



------------------
This commit was generated by Migit
2017-01-27 18:47:25 +01:00
Jacek Jendrzej
7f7f90b40d movieplayer dont chache last realurl for lua script
Origin commit data
------------------
Branch: ni/coolstream
Commit: e111bf7418
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-26 11:55:06 +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
abfb65680e fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bbfbe997b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

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

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

------------------
This commit was generated by Migit
2016-10-25 13:15:57 +02:00