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, 7 insertions, 1 deletions

diff --git a/mp_core.h b/mp_core.h
index a396c53ad9..1287d9ad2b 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -38,6 +38,12 @@ enum stop_play_reason {
     PT_STOP,
 };
 
+typedef enum {
+  EXIT_NONE,
+  EXIT_QUIT,
+  EXIT_EOF,
+  EXIT_ERROR
+} exit_reason_t;
 
 typedef struct MPContext {
     struct MPOpts opts;
@@ -129,7 +135,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask);
 void reinit_audio_chain(struct MPContext *mpctx);
 void init_vo_spudec(struct MPContext *mpctx);
 double playing_audio_pts(struct MPContext *mpctx);
-void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc);
+void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc);
 void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr);
 int reinit_video_chain(struct MPContext *mpctx);