[FFmpeg-cvslog] ffplay: update and extend documentation for channel and stream switching

Marton Balint git at videolan.org
Sat Oct 26 14:02:10 CEST 2013


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Oct 13 22:15:39 2013 +0200| [060c42bc3dff937df04f6d6166c43ab23e077ad6] | committer: Marton Balint

ffplay: update and extend documentation for channel and stream switching

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=060c42bc3dff937df04f6d6166c43ab23e077ad6
---

 doc/ffplay.texi |    7 +++++--
 ffplay.c        |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index c465af7..54b6f19 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -174,13 +174,16 @@ Toggle full screen.
 Pause.
 
 @item a
-Cycle audio channel.
+Cycle audio channel in the curret program.
 
 @item v
 Cycle video channel.
 
 @item t
-Cycle subtitle channel.
+Cycle subtitle channel in the current program.
+
+ at item c
+Cycle program.
 
 @item w
 Show audio waves.
diff --git a/ffplay.c b/ffplay.c
index 8c0c415..2930234 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3500,9 +3500,9 @@ void show_help_default(const char *opt, const char *arg)
            "q, ESC              quit\n"
            "f                   toggle full screen\n"
            "p, SPC              pause\n"
-           "a                   cycle audio channel\n"
+           "a                   cycle audio channel in the current program\n"
            "v                   cycle video channel\n"
-           "t                   cycle subtitle channel\n"
+           "t                   cycle subtitle channel in the current program\n"
            "c                   cycle program\n"
            "w                   show audio waves\n"
            "s                   activate frame-step mode\n"



More information about the ffmpeg-cvslog mailing list