mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,230 Commits 2 Branches 9 Tags
69b570ff425d833a358de1b0f8cc9cead3365f6d
Commit Graph

123 Commits

Author SHA1 Message Date
Hendi
69b570ff42 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
------------------
Commit: 91e3f9e51a
Author: Hendi <hendi48@freenet.de>
Date: 2021-05-09 (Sun, 09 May 2021)
 2021-05-09 21:04:09 +02:00
TangoCash
be48454706 fix record/stream AC3 logic 
Origin commit data
------------------
Commit: 34d8244a80
Author: TangoCash <eric@loxat.de>
Date: 2021-04-04 (Sun, 04 Apr 2021)
 2021-04-04 22:05:41 +02:00
DboxOldie
d14564fd25 generate correct camask 
Origin commit data
------------------
Commit: 814cc525b1
Author: DboxOldie <DboxOldie@users.noreply.github.com>
Date: 2021-01-23 (Sat, 23 Jan 2021)
 2021-01-23 23:18:06 +01:00
Jacek Jendrzej
b6e53127f2 streamts.cpp and record.cpp: fix memleak 
Origin commit data
------------------
Commit: d46fc58eb4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-13 (Mon, 13 Jan 2020)
 2020-01-13 17:19:28 +01:00
Jacek Jendrzej
29a7c81dab movieplayer arm: add option to play separate audio file 
Origin commit data
------------------
Commit: 47914fbdc5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-11-03 (Sun, 03 Nov 2019)
 2019-11-03 20:21:28 +01:00
Jacek Jendrzej
3f3b85bdbe api ffmpeg, renamed hls format 
Origin commit data
------------------
Commit: 2fea61e3a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-07-17 (Wed, 17 Jul 2019)
 2019-07-17 19:27:27 +02:00
Jacek Jendrzej
51245615c0 streamts: supplement to 086578fdb2a0133953b98171106699e8b04da8ea 
Origin commit data
------------------
Commit: d6ba59a7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-17 (Fri, 17 May 2019)
 2019-05-17 22:29:19 +02:00
FlatTV
f7fc6b1db3 streamts.cpp: pick ARM streaming from DDT (thx DboxOldie) 
Origin commit data
------------------
Commit: edb5fa95ee
Author: FlatTV <FlatTV@gmx.de>
Date: 2019-05-05 (Sun, 05 May 2019)
 2019-05-05 17:05:37 +02:00
max_10
3627ea3ff3 fix aac audio when streaming, thx DboxOldie 
Origin commit data
------------------
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
 2019-05-03 21:39:42 +02:00
Frankenstone
ff91a9a06b reduce ffmpeg warnings, thx DboxOldie 
Origin commit data
------------------
Commit: b160f48143
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-01 (Fri, 01 Mar 2019)
 2019-03-01 18:34:51 +01:00
Frankenstone
f696dcaec3 fix ffmpeg compiler warnings, thx DboxOldie 
Origin commit data
------------------
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)
 2019-02-27 23:25:44 +01:00
vanhofen
6622c995a9 move compatibility headers to /lib/hardware 
Origin commit data
------------------
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware
 2018-12-21 22:30:34 +01:00
vanhofen
94b4f9a712 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
------------------
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)
 2017-11-28 10:31:10 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
vanhofen
25a4911df4 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
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:55:53 +02:00
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 12:58:44 +02:00
Jacek Jendrzej
d803f09645 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: cf951434d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-20 (Tue, 20 Jun 2017)
 2017-06-20 14:26:38 +02:00
vanhofen
99130d47ab Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
 2017-06-19 23:08:41 +02:00
vanhofen
9b4906deda Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3575c5f397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 23:00:29 +02:00
Jacek Jendrzej
03ca431440 try to fix versio check for ffmpeg 
Origin commit data
------------------
Commit: 0bc31c6397
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 21:43:34 +02:00
vanhofen
c35224ff08 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
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +02:00
Stefan Seyfried
8193238246 set threadnames to unique values 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5307e62506
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:17:12 +02:00
Stefan Seyfried
4930931383 set threadnames to unique values 
Origin commit data
------------------
Commit: 1e0544cd94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)
 2017-06-03 14:54:49 +02:00
vanhofen
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 23:24:19 +02:00
vanhofen
4ad063d3f5 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 21:35:56 +02:00
vanhofen
013d9ab919 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 21:29:41 +02:00
Jacek Jendrzej
582e42e25e try to fix version check for avformat codecpar 
Origin commit data
------------------
Commit: a3bf23d9c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 17:19:43 +02:00
vanhofen
85fab3c019 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
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:45:02 +01:00
Jacek Jendrzej
8a9fcfeb55 try fix segfault with --enable-cleanup 
Origin commit data
------------------
Commit: 76530e2c05
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 19:13:37 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg 
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 15:00:17 +01:00
vanhofen
6057caae9a 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
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:04:09 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
8af59f8e99 streamts: don't overflow receive buffer, better diag message 
Origin commit data
------------------
Commit: ff0d98bcc3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:58:58 +01:00
Stefan Seyfried
aa3f0a8786 streamts: don't overflow receive buffer, better diag message 
Origin commit data
------------------
Commit: ec3201ab04
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 16:56:10 +01:00
Stefan Seyfried
b5ac078ead Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: f397d08cd3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 02:14:32 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
vanhofen
bf7cab5437 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.h


Origin commit data
------------------
Commit: 7ad8496e24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:47:25 +01:00
Jacek Jendrzej
a05d03b02c movieplayer dont chache last realurl for lua script 
Origin commit data
------------------
Commit: e111bf7418
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-26 11:55:06 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
bff69630e4 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
------------------
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:44:45 +01:00
vanhofen
d44f98a01d 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
------------------
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:34:20 +01:00
Stefan Seyfried
a40212a5eb 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
------------------
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:16:42 +01:00
vanhofen
280b559852 fix last merge 
Origin commit data
------------------
Commit: 4bbfbe997b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- fix last merge
 2016-10-25 13:15:57 +02:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
vanhofen
ca02e09411 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:30:10 +02:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
Stefan Seyfried
0f962fef46 record, streamts: use modern AV_CODEC_ID enums 
this allows to build with current ffmpeg


Origin commit data
------------------
Commit: 5bf115db80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:45:23 +02:00