Skip to content

Commit 74bfafb

Browse files
author
Jan Stabenow
committed
ADD 0.1.0-RC6.1
1 parent 96cbd05 commit 74bfafb

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Changes from 0.1.0-RC6 to 0.1.0-RC6.1
2+
3+
* fixed external streaming with RTSP over TCP input option
4+
15
## Changes from 0.1.0-RC5 to 0.1.0-RC6
26

37
* updated NPM/Bower packages

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Restreamer",
3-
"version": "0.1.0-RC6",
3+
"version": "0.1.0-RC6.1",
44
"license": "Apache-2.0",
55
"dependencies": {
66
"bootstrap": "3.3.6",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Restreamer",
3-
"version": "0.1.0-RC6",
3+
"version": "0.1.0-RC6.1",
44
"description": "Allows you to do h.264 real-time video streaming on your website without a streaming provider",
55
"author": "datarhei.org",
66
"repository": {

src/classes/Restreamer.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,11 @@ class Restreamer {
167167
return Restreamer.appendOutputOptionFromConfig(ffmpegCommand);
168168
}
169169

170-
static applyOptions (ffmpegCommand) {
171-
if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
172-
ffmpegCommand.inputOptions('-rtsp_transport tcp');
170+
static applyOptions (ffmpegCommand, streamType) {
171+
if (streamType === 'repeatToLocalNginx') {
172+
if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
173+
ffmpegCommand.inputOptions('-rtsp_transport tcp');
174+
}
173175
}
174176
}
175177

@@ -311,7 +313,7 @@ class Restreamer {
311313
Restreamer.updateProgressOnGui();
312314
command.removeAllListeners('progress');
313315
};
314-
Restreamer.applyOptions(command);
316+
Restreamer.applyOptions(command, streamType);
315317
command
316318
// stream started
317319
.on('start', (commandLine) => {

0 commit comments

Comments
 (0)