Merge svn changes up to r29752

As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.

1 files changed, 1 insertions, 0 deletions

diff --git a/mp_osd.h b/mp_osd.h
index 6a1b3b94fe..77eaacd7d2 100644
--- a/mp_osd.h
+++ b/mp_osd.h
@@ -11,6 +11,7 @@
 #define OSD_MSG_RADIO_CHANNEL           7
 /// Base id for messages generated from the commmand to property bridge.
 #define OSD_MSG_PROPERTY                0x100
+#define OSD_MSG_SUB_BASE                0x1000
 
 #define MAX_OSD_LEVEL 3
 #define MAX_TERM_OSD_LEVEL 1