diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:26:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:26:29 +0200 |
| commit | 5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a (patch) | |
| tree | aedbe852aeca7e1fbc121269f452a2c552aa89b4 /doc | |
| parent | 11e490334e0d5839ae40468960a14a964a09af3a (diff) | |
| parent | a583e2bebe7746f7a68aede707ec3eebfd908659 (diff) | |
| download | ffmpeg-5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add support for toggling between multiple video filters with the w key
ffplay: fix typo in docs
ffplay: try multiple sample rates if audio open fails
cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
ffplay: fix compilation with Visual Studio
ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffplay.texi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi index c26c68da5d..3a03d36d04 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -84,6 +84,9 @@ output. In the filtergraph, the input is associated to the label ffmpeg-filters manual for more information about the filtergraph syntax. +You can specify this parameter multiple times and cycle through the specified +filtergraphs along with the show modes by pressing the key @key{w}. + @item -af @var{filtergraph} @var{filtergraph} is a description of the filtergraph to apply to the input audio. @@ -174,7 +177,7 @@ Toggle full screen. Pause. @item a -Cycle audio channel in the curret program. +Cycle audio channel in the current program. @item v Cycle video channel. @@ -186,7 +189,7 @@ Cycle subtitle channel in the current program. Cycle program. @item w -Show audio waves. +Cycle video filters or show modes. @item s Step to the next frame. |