summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-09-27 12:38:34 -0400
committerMarton Balint <cus@passwd.hu>2015-09-27 23:04:54 +0200
commitfd44892073cc9a5737ee230b0528aba3d555378c (patch)
tree4e8fa7b23b0284af113891bde6cedb77e9e69443
parentf1a9583305d90533acb54c9cadf6afac2c4dc3fa (diff)
doc/ffplay, ffplay: add information regarding volume control
ffplay now supports dynamic volume control. This documents the supported behavior. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--doc/ffplay.texi9
-rw-r--r--ffplay.c3
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index be696c8f66..2a35c21a2c 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -197,6 +197,15 @@ Toggle full screen.
@item p, SPC
Pause.
+@item m
+Toggle mute.
+
+@item 9, 0
+Decrease and increase volume respectively.
+
+@item /, *
+Decrease and increase volume respectively.
+
@item a
Cycle audio channel in the current program.
diff --git a/ffplay.c b/ffplay.c
index 21600d0615..3c2407fb87 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3681,6 +3681,9 @@ void show_help_default(const char *opt, const char *arg)
"q, ESC quit\n"
"f toggle full screen\n"
"p, SPC pause\n"
+ "m toggle mute\n"
+ "9, 0 decrease and increase volume respectively\n"
+ "/, * decrease and increase volume respectively\n"
"a cycle audio channel in the current program\n"
"v cycle video channel\n"
"t cycle subtitle channel in the current program\n"