ADD 0.1.0-RC6.1

datarhei · Mar 11, 2016 · 74bfafb · 74bfafb
1 parent 96cbd05
commit 74bfafb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Changes from 0.1.0-RC6 to 0.1.0-RC6.1
+
+* fixed external streaming with RTSP over TCP input option
+
 ## Changes from 0.1.0-RC5 to 0.1.0-RC6
 
 * updated NPM/Bower packages

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "Restreamer",
-    "version": "0.1.0-RC6",
+    "version": "0.1.0-RC6.1",
     "license": "Apache-2.0",
     "dependencies": {
         "bootstrap": "3.3.6",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Restreamer",
-    "version": "0.1.0-RC6",
+    "version": "0.1.0-RC6.1",
     "description": "Allows you to do h.264 real-time video streaming on your website without a streaming provider",
     "author": "datarhei.org",
     "repository": {

diff --git a/src/classes/Restreamer.js b/src/classes/Restreamer.js
@@ -167,9 +167,11 @@ class Restreamer {
         return Restreamer.appendOutputOptionFromConfig(ffmpegCommand);
     }
 
-    static applyOptions (ffmpegCommand) {
-        if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
-            ffmpegCommand.inputOptions('-rtsp_transport tcp');
+    static applyOptions (ffmpegCommand, streamType) {
+        if (streamType === 'repeatToLocalNginx') {
+            if (Restreamer.data.options.rtspTcp && Restreamer.data.addresses.srcAddress.indexOf('rtsp') === 0) {
+                ffmpegCommand.inputOptions('-rtsp_transport tcp');
+            }
         }
     }
 
@@ -311,7 +313,7 @@ class Restreamer {
                 Restreamer.updateProgressOnGui();
                 command.removeAllListeners('progress');
             };
-            Restreamer.applyOptions(command);
+            Restreamer.applyOptions(command, streamType);
             command
                 // stream started
                 .on('start', (commandLine) => {