diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-14 22:31:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-14 22:31:47 +0100 |
| commit | dc5f0018784895198919beb8a7bf47c423ed210f (patch) | |
| tree | a531fca0beee5e9002be8b3decf519fd86fbe4a6 /doc | |
| parent | e1ba29c76430ce511fd901c8b7a1bd199b169dc0 (diff) | |
| parent | efe8a1ba08dd868e5a96f5759258b0733bb2004c (diff) | |
| download | ffmpeg-dc5f0018784895198919beb8a7bf47c423ed210f.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: clear pkt_temp when pkt is freed.
ffplay: Fix got_frame type.
ffplay: add 10 minute seek support to ffplay
ffplay: force setting video mode on fullscreen toggle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffplay.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi index b4d6dbcdcb..06666f6e59 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -168,6 +168,9 @@ Seek backward/forward 10 seconds. @item down/up Seek backward/forward 1 minute. +@item page down/page up +Seek backward/forward 10 minutes. + @item mouse click Seek to percentage in file corresponding to fraction of width. |