Thulinma
|
c51f1b4955
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-11-16 16:16:44 +01:00 |
|
Thulinma
|
f268988354
|
Fixed buffer incorrectly nulling indexes for live streams.
|
2015-11-16 16:15:52 +01:00 |
|
Thulinma
|
2bc333956a
|
Merge branch 'development' into LTS_development
|
2015-11-16 11:44:19 +01:00 |
|
Thulinma
|
c194396215
|
Clarified valid page numbers debug message.
|
2015-11-16 11:44:11 +01:00 |
|
Thulinma
|
bd836f247d
|
Merge branch 'development' into LTS_development
|
2015-11-12 11:11:40 +01:00 |
|
Thulinma
|
e20761e8c7
|
Fix the case when a keyframe is not the first data pushed.
|
2015-11-12 11:11:32 +01:00 |
|
Thulinma
|
4db86ab2bb
|
Fixed HTTP-based CONN_PLAY triggers URLs
|
2015-11-12 10:13:16 +01:00 |
|
Thulinma
|
35b2dd6bee
|
Better working TS input, Pro side. Code by Erik Zandvliet.
|
2015-11-05 17:11:04 +01:00 |
|
Thulinma
|
8bcda5e57b
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/bitstream.h
# lib/h264.cpp
# lib/h264.h
# lib/nal.cpp
# lib/nal.h
|
2015-11-05 17:07:17 +01:00 |
|
Thulinma
|
b28a619fc6
|
Various fixes and improvements, backported from Pro version. Code by Erik Zandvliet.
|
2015-11-05 17:05:21 +01:00 |
|
Thulinma
|
8678a845f3
|
Merge branch 'development' into LTS_development
|
2015-11-02 17:14:44 +01:00 |
|
Thulinma
|
5cce37c521
|
Fixed RTMP extended timestamp read
|
2015-11-02 17:14:38 +01:00 |
|
Thulinma
|
4889abb64e
|
Merge branch 'development' into LTS_development
|
2015-11-02 15:53:01 +01:00 |
|
Thulinma
|
3a07633de5
|
Improved Socker::Buffer deletion handling.
|
2015-11-02 15:52:48 +01:00 |
|
Thulinma
|
01e9a45335
|
Clarified comment
|
2015-10-29 16:50:36 +01:00 |
|
Thulinma
|
67e1a832a2
|
Removed confusing comments.
|
2015-10-29 16:34:37 +01:00 |
|
ozzay
|
e0ab83e61c
|
MP4 keyframe problem fixed
|
2015-10-29 16:26:09 +01:00 |
|
Thulinma
|
d504bbe720
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-10-20 15:36:33 +02:00 |
|
Thulinma
|
9df850a149
|
Fix for repushing.
|
2015-10-20 15:35:21 +02:00 |
|
cat
|
d4ca1dab42
|
LSP average bitrate is now peak bitrate
|
2015-10-20 14:39:02 +02:00 |
|
Thulinma
|
26809fa467
|
Merge branch 'development' into LTS_development
|
2015-10-20 14:34:34 +02:00 |
|
Thulinma
|
59a4329266
|
Merge branch 'development' into LTS_development
|
2015-10-20 14:12:17 +02:00 |
|
Thulinma
|
500cdf6e71
|
Improved BPS calculation for live streams.
|
2015-10-20 14:12:11 +02:00 |
|
cat
|
718c0b7f35
|
embed selfdetection fix
|
2015-10-20 11:40:36 +02:00 |
|
Thulinma
|
58d4015af2
|
Merge branch 'development' into LTS_development
|
2015-10-20 11:39:57 +02:00 |
|
Thulinma
|
3ed0d1b3a3
|
Merge branch 'development' into LTS_development
|
2015-10-19 16:59:36 +02:00 |
|
cat
|
718d009f9f
|
embed exclude for IE/FF fix
|
2015-10-19 16:47:52 +02:00 |
|
Thulinma
|
a02236eca1
|
Merge branch 'development' into LTS_development
|
2015-10-16 09:21:00 +02:00 |
|
cat
|
2a7a714aad
|
LSP - bad code, bad! no overwriting my streams object with null :(
|
2015-10-16 09:13:11 +02:00 |
|
cat
|
0b784a3d53
|
LSP embed code page small edits
|
2015-10-15 16:31:31 +02:00 |
|
Thulinma
|
596689c9ee
|
Merge branch 'development' into LTS_development
|
2015-10-15 10:28:33 +02:00 |
|
Erik Zandvliet
|
c417630abe
|
Same fix, but for non-const iterator
|
2015-10-15 10:28:24 +02:00 |
|
Thulinma
|
101de0b81c
|
Merge branch 'development' into LTS_development
|
2015-10-14 16:53:20 +02:00 |
|
Thulinma
|
9737d9fbdf
|
Added missing return value for JSON class.
|
2015-10-14 16:53:13 +02:00 |
|
Thulinma
|
de1d202457
|
Made RTSP max send value runtime configurable.
|
2015-10-14 14:30:28 +02:00 |
|
Thulinma
|
39fd36db04
|
Merge branch 'development' into LTS_development
# Conflicts:
# Makefile
|
2015-10-14 12:56:47 +02:00 |
|
Thulinma
|
c2cb32e022
|
Removed old Makefile.
|
2015-10-14 12:56:26 +02:00 |
|
Thulinma
|
e3f324e9af
|
Merge branch 'development' into LTS_development
|
2015-10-14 11:19:08 +02:00 |
|
Thulinma
|
b28b463662
|
Improved HLS bandwidth accuracy.
|
2015-10-14 11:18:56 +02:00 |
|
Thulinma
|
e567945bcc
|
Merge branch 'development' into LTS_development
|
2015-10-14 10:57:17 +02:00 |
|
Thulinma
|
acbeb1f409
|
Added missing trigger.
|
2015-10-14 10:57:10 +02:00 |
|
Thulinma
|
279add438a
|
Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
|
2015-10-14 10:48:00 +02:00 |
|
Thulinma
|
eb6b98b219
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller.cpp
|
2015-10-14 10:38:59 +02:00 |
|
Thulinma
|
3ba11441a1
|
Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly.
|
2015-10-14 10:25:58 +02:00 |
|
Thulinma
|
6b21e06c76
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:56:53 +02:00 |
|
cat
|
1cae0a7fd3
|
LSP - trigger deletion with the rest of config
|
2015-10-13 15:56:24 +02:00 |
|
cat
|
9943509d5f
|
LSP back to extend, Jarons solution = issues.
|
2015-10-13 15:56:15 +02:00 |
|
Thulinma
|
73ef41e97b
|
Properly trigger failure state on streams when connection to source fails.
|
2015-10-13 15:55:26 +02:00 |
|
Thulinma
|
330117b1f4
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:34:58 +02:00 |
|
Thulinma
|
2f4a4660d0
|
Fixed controller breaking when all connectors are deleted simultaneously.
|
2015-10-13 15:34:24 +02:00 |
|