Thulinma
|
a97797a604
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-05-11 19:18:20 +02:00 |
|
Thulinma
|
2845cbedcb
|
More fixes to Windows live metadata handling.
|
2015-05-11 19:11:00 +02:00 |
|
Thulinma
|
657d7ad7ca
|
Fixed MP4 playback problems with zero-length parts (Mantrics playback issue).
|
2015-05-11 19:02:00 +02:00 |
|
Thulinma
|
ccaec3d2f8
|
Fixed live stream memory leak in Windows builds
|
2015-05-07 19:00:01 +02:00 |
|
Thulinma
|
6f933bdb97
|
Fixed live pushing when more than 2 tracks present.
|
2015-05-07 12:02:49 +02:00 |
|
Thulinma
|
77dcfc23ad
|
Removed remaining recording code.
|
2015-04-28 09:39:01 +02:00 |
|
Thulinma
|
c96f0fb9e4
|
Merge branch 'development' into LTS_development
|
2015-04-21 17:14:51 +02:00 |
|
Thulinma
|
acc462c281
|
Minor edit to live buffer semaphore naming.
|
2015-04-21 17:14:13 +02:00 |
|
Thulinma
|
ac540cdd1d
|
LTS feature: Added support for setting/overriding the error text for failed streams.
|
2015-04-17 02:01:27 +02:00 |
|
Thulinma
|
8e3de119b8
|
Merge branch 'development' into LTS_development
|
2015-04-16 16:10:41 +02:00 |
|
Thulinma
|
a891b5ba41
|
Fixed Windows typo.
|
2015-04-16 16:10:34 +02:00 |
|
Thulinma
|
241ac8f911
|
Merge branch 'development' into LTS_development
|
2015-04-16 15:59:32 +02:00 |
|
Thulinma
|
e672959f96
|
Fixes to Windows shared memory handling for VoD.
|
2015-04-16 15:59:25 +02:00 |
|
Thulinma
|
98cfc3c199
|
Merge branch 'development' into LTS_development
|
2015-04-16 15:01:49 +02:00 |
|
Thulinma
|
f20f1607c6
|
More debugging.
|
2015-04-16 15:01:41 +02:00 |
|
Thulinma
|
32e7893f80
|
Merge branch 'development' into LTS_development
|
2015-04-16 14:39:30 +02:00 |
|
Thulinma
|
ef26df5e38
|
Changed + in shared memory page name to _
|
2015-04-16 14:39:23 +02:00 |
|
Thulinma
|
c458572192
|
Merge branch 'development' into LTS_development
|
2015-04-16 14:21:15 +02:00 |
|
Thulinma
|
a556d6032d
|
Added insane-level debug message for opening of all shared memory pages.
|
2015-04-16 14:21:07 +02:00 |
|
Thulinma
|
b2f4b02669
|
Merge branch 'development' into LTS_development
|
2015-04-16 14:07:11 +02:00 |
|
Thulinma
|
2808595d7b
|
Changed Windows shared memory back to non-global.
|
2015-04-16 14:07:04 +02:00 |
|
Thulinma
|
2ab799db93
|
Merge branch 'development' into LTS_development
|
2015-04-16 13:22:06 +02:00 |
|
Thulinma
|
e105569b06
|
More changes to Windows support.
|
2015-04-16 13:21:30 +02:00 |
|
Thulinma
|
721e9dfd05
|
Merge branch 'development' into LTS_development
|
2015-04-16 13:19:01 +02:00 |
|
Thulinma
|
d120523bbb
|
Improvements to connector shutdown code, attempted fix for Windows support.
|
2015-04-16 13:18:52 +02:00 |
|
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
|
7c0db4531d
|
Removed legacy libraries (converter, ftp, filesystem) from codebase.
|
2015-04-15 14:24:43 +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 |
|
Thulinma
|
8d377602be
|
Changed windows shm functions to ANSI equivalents.
|
2015-04-13 16:58:30 +02:00 |
|
Thulinma
|
ad8af44c4d
|
Merge branch 'development' into LTS_development
|
2015-04-12 15:32:04 +02:00 |
|
Thulinma
|
c000249ad5
|
Improved shared memory namings to no longer use the '#' character, added cmake-related files to .gitignore
|
2015-04-12 15:31:52 +02:00 |
|
Thulinma
|
e163a1ed87
|
Merge branch 'development' into LTS_development
|
2015-04-10 17:24:18 +02:00 |
|
cat
|
f94141ca26
|
LSP - should now be minified
|
2015-04-10 16:41:11 +02:00 |
|
cat
|
9140994aca
|
LSP - allow for .exe in protocol dependencies
|
2015-04-10 13:46:31 +02:00 |
|
cat
|
f011de6fb9
|
LSP - fixed repeat passwd focus bug
|
2015-04-09 14:51:07 +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 |
|