[vlc-commits] vlckit: fixes sout chain issue in stream output.

[Sebastien Zwickert]

vlc | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Tue Aug 30 08:33:53 2011 +0200| [68f5f49e5835d4896bf2bdaf8ff062aaf8d49c9c] | committer: Jean-Baptiste Kempf

vlckit: fixes sout chain issue in stream output.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=68f5f49e5835d4896bf2bdaf8ff062aaf8d49c9c
---

 .../macosx/framework/Sources/VLCStreamOutput.m     |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/projects/macosx/framework/Sources/VLCStreamOutput.m b/projects/macosx/framework/Sources/VLCStreamOutput.m
index 8852099..86d2c09 100644
--- a/projects/macosx/framework/Sources/VLCStreamOutput.m
+++ b/projects/macosx/framework/Sources/VLCStreamOutput.m
@@ -190,7 +190,11 @@
         if( destination ) [subOptions addObject:[NSString stringWithFormat:@"dst=\"%@\"", [destination stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]];
         if( url ) [subOptions addObject:[NSString stringWithFormat:@"url=\"%@\"", [url stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]];
         if( access )      [subOptions addObject:[NSString stringWithFormat:@"access=%@", access]];
-        [optionsAsArray addObject:[NSString stringWithFormat:@"#std{%@}", [subOptions componentsJoinedByString:@","]]];
+        NSString *std = [NSString stringWithFormat:@"std{%@}", [subOptions componentsJoinedByString:@","]];
+        if ( !transcodingOptions )
+            std = [NSString stringWithFormat:@"#%@", std];
+
+        [optionsAsArray addObject:std];
         [subOptions removeAllObjects];
     }
 
@@ -207,7 +211,11 @@
         if( sdp )      [subOptions addObject:[NSString stringWithFormat:@"sdp=%@", sdp]];
         if( sap )      [subOptions addObject:@"sap"];
         if( name )      [subOptions addObject:[NSString stringWithFormat:@"name=\"%@\"", name]];
-        [optionsAsArray addObject:[NSString stringWithFormat:@"#rtp{%@}", [subOptions componentsJoinedByString:@","]]];
+        NSString *rtp = [NSString stringWithFormat:@"#rtp{%@}", [subOptions componentsJoinedByString:@","]];
+        if ( !transcodingOptions )
+            rtp = [NSString stringWithFormat:@"#%@", rtp];
+
+        [optionsAsArray addObject:rtp];
         [subOptions removeAllObjects];
     }
     representedOptions = [optionsAsArray componentsJoinedByString:@":"];