From 450af05338fd0ea0ff33e2e03f934d7a4aa5f8fa Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 22 May 2015 20:03:14 +0200
Subject: options: rename --media-title option

Conflicts with the property.
---
 options/options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 4c46c6f190..44d4beae30 100644
--- a/options/options.c
+++ b/options/options.c
@@ -402,7 +402,7 @@ const m_option_t mp_opts[] = {
     // vo name (X classname) and window title strings
     OPT_STRING("x11-name", vo.winname, 0),
     OPT_STRING("title", wintitle, 0),
-    OPT_STRING("media-title", media_title, 0),
+    OPT_STRING("force-media-title", media_title, 0),
     // set aspect ratio of monitor - useful for 16:9 TV-out
     OPT_FLOATRANGE("monitoraspect", vo.force_monitor_aspect, 0, 0.0, 9.0),
     OPT_FLOATRANGE("monitorpixelaspect", vo.monitor_pixel_aspect, 0, 0.2, 9.0),
@@ -632,6 +632,7 @@ const m_option_t mp_opts[] = {
     OPT_REPLACED("mkv-subtitle-preroll", "demuxer-mkv-subtitle-preroll"),
     OPT_REPLACED("dtshd", "ad-spdif-dtshd"),
     OPT_REPLACED("ass-use-margins", "sub-use-margins"),
+    OPT_REPLACED("media-title", "force-media-title"),
 
     {0}
 };
-- 
cgit v1.2.3