diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /core/m_property.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'core/m_property.c')
| -rw-r--r-- | core/m_property.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/m_property.c b/core/m_property.c index f7e8d5649f..904148e6ee 100644 --- a/core/m_property.c +++ b/core/m_property.c @@ -75,7 +75,7 @@ static bool translate_legacy_property(const char *name, char *buffer, } if (strcmp(old_name, buffer) != 0) { - mp_msg(MSGT_CPLAYER, MSGL_V, "Warning: property '%s' is deprecated, " + mp_msg(MSGT_CPLAYER, MSGL_WARN, "Warning: property '%s' is deprecated, " "replaced with '%s'. Fix your input.conf!\n", old_name, buffer); } |