From ff0b33ac9da3bd685066843dff0ff7c8bb5342c7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 22 May 2015 20:05:04 +0200
Subject: command: rename audio-format property

Clashes with the option.
---
 DOCS/interface-changes.rst | 1 +
 DOCS/man/input.rst         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index b037588558..69cf0021a2 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
 ::
 
  --- mpv 0.10.0 will be released ---
+    - deprecate "audio-format" property, replaced with "audio-codec-name"
     - deprecate --media-title, replaced with --force-media-title
     - deprecate "length" property, replaced with "duration"
     - change volume property:
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 09cbe8b718..57823497ad 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1143,12 +1143,12 @@ Property list
 ``audio-delay`` (RW)
     See ``--audio-delay``.
 
-``audio-format``
-    Audio format as string.
-
 ``audio-codec``
     Audio codec selected for decoding.
 
+``audio-codec-name``
+    Audio codec.
+
 ``audio-samplerate``
     Audio samplerate.
 
-- 
cgit v1.2.3