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

diff --git a/mp_msg.c b/mp_msg.c
index 0a4a786979..627ee04187 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -80,19 +80,19 @@ void mp_msg_init(void){
     stdoutAttrs = cinfo.wAttributes;
 #endif
     int i;
-    char *env = getenv("MPLAYER_VERBOSE");
+    char *env = getenv("MPV_VERBOSE");
     if (env)
         verbose = atoi(env);
     for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2;
     mp_msg_cancolor = isatty(fileno(stdout));
     mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default
 #ifdef CONFIG_TRANSLATION
-    textdomain("mplayer");
-    char *localedir = getenv("MPLAYER_LOCALEDIR");
+    textdomain("mpv");
+    char *localedir = getenv("MPV_LOCALEDIR");
     if (localedir == NULL && strlen(MPLAYER_LOCALEDIR))
         localedir = MPLAYER_LOCALEDIR;
-    bindtextdomain("mplayer", localedir);
-    bind_textdomain_codeset("mplayer", "UTF-8");
+    bindtextdomain("mpv", localedir);
+    bind_textdomain_codeset("mpv", "UTF-8");
 #endif
 }