]> git.sesse.net Git - vlc/commitdiff
vlckit: fixes sout chain issue in stream output.
authorSebastien Zwickert <dilaroga@free.fr>
Tue, 30 Aug 2011 06:33:53 +0000 (08:33 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 5 Oct 2011 16:43:02 +0000 (18:43 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
projects/macosx/framework/Sources/VLCStreamOutput.m

index 88520997dfa1be5f320375211a9c9e79edea22e1..86d2c0954acdf03bcd86ec9d00026054b76562d7 100644 (file)
         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];
     }
 
         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:@":"];