[vlc-commits] commit: VLCKit: Add the # character that prefixes the output chain. ( Sebastien Zwickert )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Sun Mar 28 15:19:03 2010 +0200| [da7b8fb98fa9d77fe81e41f34eed223a7c8aa60d] | committer: Pierre d'Herbemont 

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

This fixes transcoding with VLCKit.

Signed-off-by: Pierre d'Herbemont <pdherbemont at free.fr>
(cherry picked from commit 6ef23b74e938f1d25009ac01d07b19b451837512)

Signed-off-by: Pierre d'Herbemont <pdherbemont at free.fr>

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

 .../macosx/framework/Sources/VLCStreamOutput.m     |    6 +++---
 .../macosx/framework/Sources/VLCStreamSession.m    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/macosx/framework/Sources/VLCStreamOutput.m b/projects/macosx/framework/Sources/VLCStreamOutput.m
index 1fba281..8852099 100644
--- a/projects/macosx/framework/Sources/VLCStreamOutput.m
+++ b/projects/macosx/framework/Sources/VLCStreamOutput.m
@@ -175,7 +175,7 @@
         if( audioBitrate ) [subOptions addObject:[NSString stringWithFormat:@"ab=%@", audioBitrate]];
         if( channels ) [subOptions addObject:[NSString stringWithFormat:@"channels=%@", channels]];
         if( audioSync ) [subOptions addObject:[NSString stringWithFormat:@"audioSync", width]];
-        [optionsAsArray addObject: [NSString stringWithFormat:@"transcode{%@}", [subOptions componentsJoinedByString:@","]]];
+        [optionsAsArray addObject: [NSString stringWithFormat:@"#transcode{%@}", [subOptions componentsJoinedByString:@","]]];
         [subOptions removeAllObjects];
     }
     
@@ -190,7 +190,7 @@
         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:@","]]];
+        [optionsAsArray addObject:[NSString stringWithFormat:@"#std{%@}", [subOptions componentsJoinedByString:@","]]];
         [subOptions removeAllObjects];
     }
 
@@ -207,7 +207,7 @@
         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:@","]]];
+        [optionsAsArray addObject:[NSString stringWithFormat:@"#rtp{%@}", [subOptions componentsJoinedByString:@","]]];
         [subOptions removeAllObjects];
     }
     representedOptions = [optionsAsArray componentsJoinedByString:@":"];
diff --git a/projects/macosx/framework/Sources/VLCStreamSession.m b/projects/macosx/framework/Sources/VLCStreamSession.m
index 136f310..c954ff8 100644
--- a/projects/macosx/framework/Sources/VLCStreamSession.m
+++ b/projects/macosx/framework/Sources/VLCStreamSession.m
@@ -73,7 +73,7 @@
 {
     NSString * libvlcArgs;
     if( self.drawable )
-        libvlcArgs = [NSString stringWithFormat:@"duplicate{dst=display,dst=\"%@\"}",[streamOutput representedLibVLCOptions]];
+        libvlcArgs = [NSString stringWithFormat:@"#duplicate{dst=display,dst=\"%@\"}",[streamOutput representedLibVLCOptions]];
     else
         libvlcArgs = [streamOutput representedLibVLCOptions];
     if( libvlcArgs )