Merge branch 'master' into osd_changes

Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c

1 files changed, 4 insertions, 1 deletions

diff --git a/command.h b/command.h
index 1367fa88e4..0a339c5705 100644
--- a/command.h
+++ b/command.h
@@ -23,7 +23,10 @@ struct MPContext;
 struct mp_cmd;
 
 void run_command(struct MPContext *mpctx, struct mp_cmd *cmd);
-char *property_expand_string(struct MPContext *mpctx, char *str);
+char *mp_property_expand_string(struct MPContext *mpctx, char *str);
 void property_print_help(void);
+int mp_property_do(const char* name, int action, void* val,
+                   struct MPContext *mpctx);
+char* mp_property_print(const char *name, struct MPContext *mpctx);
 
 #endif /* MPLAYER_COMMAND_H */