Thulinma
|
5b86b0254b
|
Merge branch 'development' into LTS_development
|
2015-04-16 12:40:58 +02:00 |
|
Thulinma
|
2e052fa2a1
|
Removed old converter include.
|
2015-04-16 12:40:31 +02:00 |
|
Thulinma
|
cb298c57fd
|
Merge branch 'development' into LTS_development
# Conflicts:
# CMakeLists.txt
# src/analysers/info.cpp
|
2015-04-16 12:24:37 +02:00 |
|
Thulinma
|
243a05c8af
|
Removed unused code from procs library, updated and simplified connector handler in controller.
|
2015-04-16 12:23:03 +02:00 |
|
Thulinma
|
184f7ad6c8
|
Removed old MistInfo binary and dependencies on it.
|
2015-04-16 12:21:33 +02:00 |
|
Thulinma
|
9b683f6ee3
|
Merge branch 'development' into LTS_development
|
2015-04-15 13:49:18 +02:00 |
|
Thulinma
|
73b1f2d75c
|
Prevented deleting live tracks too soon.
|
2015-04-15 13:49:12 +02:00 |
|
Thulinma
|
272debb196
|
Merge branch 'development' into LTS_development
|
2015-04-15 12:33:23 +02:00 |
|
Thulinma
|
f94f7963de
|
Fixed HDS live playback.
|
2015-04-15 12:33:06 +02:00 |
|
Thulinma
|
818ffbed33
|
Merge branch 'development' into LTS_development
|
2015-04-14 17:33:35 +02:00 |
|
Thulinma
|
f86476153e
|
Fixed live semaphore problems.
|
2015-04-14 17:33:30 +02:00 |
|
Thulinma
|
3489d1ee34
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-04-14 15:32:05 +02:00 |
|
Thulinma
|
69cf17d01d
|
Increased maximum simultaneous tracks from 5 to 10, made this a define option. Allow multiple pushes through a single RTMP connection.
|
2015-04-14 15:30:25 +02:00 |
|
Erik Zandvliet
|
d296ac60bb
|
Fixed folder support
|
2015-04-07 14:39:39 +02:00 |
|
Thulinma
|
514f0a9b2b
|
Fixes to AC3, MP3, 4+GiB MP4 and MP4 B-frames by Oswald de Bruin
|
2015-04-07 14:38:39 +02:00 |
|
Thulinma
|
f48cdb14a1
|
Merge branch 'openSourceMulti' into proMulti
|
2015-04-06 20:26:08 +02:00 |
|
Thulinma
|
4a8abcaae6
|
Fixed MP4 filesize estimate.
|
2015-04-06 20:25:34 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
4ee59b9aaf
|
Various fixes
|
2015-04-03 14:58:06 +02:00 |
|
Erik Zandvliet
|
f350ab84fd
|
Fixed the lsp generation, Fixed metadata loading
|
2015-04-03 14:01:40 +02:00 |
|
Thulinma
|
185d75e0d9
|
Fixed iPhone/iPad/iPod user agent detection.
|
2015-04-02 16:32:27 +02:00 |
|
Thulinma
|
8c1bb07403
|
Tweaked RTMP analyser to use same code path as RTMP output.
|
2015-04-02 16:32:18 +02:00 |
|
Thulinma
|
a9a7ff7202
|
Tweaked debug message verbosity.
|
2015-04-02 16:32:08 +02:00 |
|
Thulinma
|
3c8cc43ad9
|
Fixed HLS edge case handling.
|
2015-04-02 16:32:00 +02:00 |
|
Thulinma
|
f9201cbf9a
|
Fixes to HTTP parser lib, DTSCMeta keysizes, MP4 headers and 4+GiB MP4 file output by Oswald de Bruin
|
2015-04-02 16:22:52 +02:00 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Erik Zandvliet
|
9b6312ca01
|
Switch to CMake
|
2015-04-02 09:55:33 +02:00 |
|
Thulinma
|
92d5d9be51
|
Fixed audio-only HLS output
|
2015-03-14 14:02:46 +01:00 |
|
Thulinma
|
cf52b6bbcc
|
Added support for space as a stream separator character.
|
2015-03-13 01:05:01 +01:00 |
|
Thulinma
|
39f06dc99a
|
Added MP3 input support (coded by Erik Zandvliet)
|
2015-03-10 12:52:44 +01:00 |
|
wouter spruit
|
bbb405269f
|
removed fixed in info.cpp analyser
|
2015-03-06 14:20:50 +01:00 |
|
Thulinma
|
96328cd035
|
Changed default buffer size to 50s from 30s
|
2015-03-06 12:48:23 +01:00 |
|
Thulinma
|
260a0ceb68
|
Fixed various HLS problems with LQ/short inputs
|
2015-03-06 11:19:49 +01:00 |
|
wouter spruit
|
ff049f4ea2
|
continuity improvements
|
2015-03-06 10:32:19 +01:00 |
|
Thulinma
|
95f19c4259
|
Merged TS unification edits by Wouter Spruit.
|
2015-03-05 13:49:09 +01:00 |
|
Thulinma
|
3ef9f70ef7
|
Small tweaks to output verbosity and include flags.
|
2015-03-05 13:24:15 +01:00 |
|
Thulinma
|
43d20268ac
|
Removed outdated converters from codebase.
|
2015-03-05 12:31:31 +01:00 |
|
Thulinma
|
87583dae49
|
Gracefully shut down outputs when signals are received.
|
2015-03-05 00:31:45 +01:00 |
|
Thulinma
|
81b7ab9a0e
|
Fix page switching right after an audio track seek.
|
2015-03-04 18:58:08 +01:00 |
|
Thulinma
|
11cb5a640f
|
Fixed HLS last segment missing.
|
2015-03-04 16:15:00 +01:00 |
|
Thulinma
|
35ddc79c1a
|
added pid/timeout/kill functionality to stats
# Conflicts:
# src/output/output_rtmp.cpp
|
2015-03-03 11:33:52 +01:00 |
|
Thulinma
|
7f4e92980c
|
Fixed SMIL output.
|
2015-02-26 14:09:52 +01:00 |
|
wouter spruit
|
bac101b1e5
|
added sleep in output_http, fix for high CPU usage
|
2015-02-25 16:17:10 +01:00 |
|
Thulinma
|
4586289c83
|
Changed type of debug setting for inputs/outputs to "debug" instead of "uint".
|
2015-02-20 17:05:51 +01:00 |
|
Thulinma
|
9a0e009069
|
Fix merge mistake
|
2015-02-19 12:36:40 +01:00 |
|
wouter spruit
|
ed997a1bc3
|
Fixed live HLS
|
2015-02-19 10:51:07 +01:00 |
|
Thulinma
|
e595964832
|
TS library function name unification.
|
2015-02-19 03:00:10 +01:00 |
|
Thulinma
|
09c7881d10
|
Some fixes to HLS output.
|
2015-02-18 18:53:53 +01:00 |
|
Thulinma
|
44c0227064
|
Added Content-Length HTTP bug workaround for VLC versions < 2.2.0
|
2015-02-18 15:09:41 +01:00 |
|
Thulinma
|
32dfc25ee9
|
Fixed merge error.
|
2015-02-18 02:58:14 +01:00 |
|