Commit da7b8fb9 authored by Sebastien Zwickert's avatar Sebastien Zwickert Committed by Pierre d'Herbemont

VLCKit: Add the # character that prefixes the output chain.

This fixes transcoding with VLCKit.
Signed-off-by: default avatarPierre d'Herbemont <pdherbemont@free.fr>
(cherry picked from commit 6ef23b74)
Signed-off-by: default avatarPierre d'Herbemont <pdherbemont@free.fr>
parent cbe58a4f
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
if( audioBitrate ) [subOptions addObject:[NSString stringWithFormat:@"ab=%@", audioBitrate]]; if( audioBitrate ) [subOptions addObject:[NSString stringWithFormat:@"ab=%@", audioBitrate]];
if( channels ) [subOptions addObject:[NSString stringWithFormat:@"channels=%@", channels]]; if( channels ) [subOptions addObject:[NSString stringWithFormat:@"channels=%@", channels]];
if( audioSync ) [subOptions addObject:[NSString stringWithFormat:@"audioSync", width]]; if( audioSync ) [subOptions addObject:[NSString stringWithFormat:@"audioSync", width]];
[optionsAsArray addObject: [NSString stringWithFormat:@"transcode{%@}", [subOptions componentsJoinedByString:@","]]]; [optionsAsArray addObject: [NSString stringWithFormat:@"#transcode{%@}", [subOptions componentsJoinedByString:@","]]];
[subOptions removeAllObjects]; [subOptions removeAllObjects];
} }
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
if( destination ) [subOptions addObject:[NSString stringWithFormat:@"dst=\"%@\"", [destination stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]]; if( destination ) [subOptions addObject:[NSString stringWithFormat:@"dst=\"%@\"", [destination stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]];
if( url ) [subOptions addObject:[NSString stringWithFormat:@"url=\"%@\"", [url stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]]; if( url ) [subOptions addObject:[NSString stringWithFormat:@"url=\"%@\"", [url stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]];
if( access ) [subOptions addObject:[NSString stringWithFormat:@"access=%@", access]]; if( access ) [subOptions addObject:[NSString stringWithFormat:@"access=%@", access]];
[optionsAsArray addObject:[NSString stringWithFormat:@"std{%@}", [subOptions componentsJoinedByString:@","]]]; [optionsAsArray addObject:[NSString stringWithFormat:@"#std{%@}", [subOptions componentsJoinedByString:@","]]];
[subOptions removeAllObjects]; [subOptions removeAllObjects];
} }
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
if( sdp ) [subOptions addObject:[NSString stringWithFormat:@"sdp=%@", sdp]]; if( sdp ) [subOptions addObject:[NSString stringWithFormat:@"sdp=%@", sdp]];
if( sap ) [subOptions addObject:@"sap"]; if( sap ) [subOptions addObject:@"sap"];
if( name ) [subOptions addObject:[NSString stringWithFormat:@"name=\"%@\"", name]]; if( name ) [subOptions addObject:[NSString stringWithFormat:@"name=\"%@\"", name]];
[optionsAsArray addObject:[NSString stringWithFormat:@"rtp{%@}", [subOptions componentsJoinedByString:@","]]]; [optionsAsArray addObject:[NSString stringWithFormat:@"#rtp{%@}", [subOptions componentsJoinedByString:@","]]];
[subOptions removeAllObjects]; [subOptions removeAllObjects];
} }
representedOptions = [optionsAsArray componentsJoinedByString:@":"]; representedOptions = [optionsAsArray componentsJoinedByString:@":"];
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
{ {
NSString * libvlcArgs; NSString * libvlcArgs;
if( self.drawable ) if( self.drawable )
libvlcArgs = [NSString stringWithFormat:@"duplicate{dst=display,dst=\"%@\"}",[streamOutput representedLibVLCOptions]]; libvlcArgs = [NSString stringWithFormat:@"#duplicate{dst=display,dst=\"%@\"}",[streamOutput representedLibVLCOptions]];
else else
libvlcArgs = [streamOutput representedLibVLCOptions]; libvlcArgs = [streamOutput representedLibVLCOptions];
if( libvlcArgs ) if( libvlcArgs )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment