Merge branch 'master' into lpcm_encoder

[vlc] / modules / gui / macosx / output.m

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index e7f3133d0396801a6d29b3ed01fd7f3891443fb7..14ff97b768d3136a167695b04c08b2967d5afc90 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -59,7 +59,7 @@
     o_mrl = [o_mrl_array copy];
 }
 
-- (NSArray *)getMRL
+- (NSArray *)mrl
 {
     return [o_mrl copy];
 }