Merge svn changes up to r28087

Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h

1 files changed, 1 insertions, 1 deletions

diff --git a/command.c b/command.c
index 6f73e67a84..9d4c38726b 100644
--- a/command.c
+++ b/command.c
@@ -2513,7 +2513,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
 	    break;
 
 	case MP_CMD_QUIT:
-	    exit_player_with_rc(mpctx, MSGTR_Exit_quit,
+	    exit_player_with_rc(mpctx, EXIT_QUIT,
 				(cmd->nargs > 0) ? cmd->args[0].v.i : 0);
 
 	case MP_CMD_PLAY_TREE_STEP:{