diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-06 20:20:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-06 20:23:29 +0200 |
| commit | f9bc65e399d1883da21ae03d07b09348a11a5f49 (patch) | |
| tree | b28bcc92bbb5a2d364518d8b3c71dfdbe9d4e1df | |
| parent | b76d6eb3bd70b38c1d02b257462bc7ed102550fb (diff) | |
| parent | 041caf1a63f091745b95a6d51c23fbdcb604d4ce (diff) | |
| download | ffmpeg-f9bc65e399d1883da21ae03d07b09348a11a5f49.tar.gz | |
Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'
* commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce':
avplay: Exit by default at the end of playback
Conflicts:
Changelog
ffplay.c
Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | doc/ffplay.texi | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -14,6 +14,7 @@ version <next>: - Matroska 3D support thorugh side data - HTML generation using texi2html is deprecated in favor of makeinfo/texi2any - silenceremove filter +- ffplay now exits by default at the end of playback version 2.3: diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 203085c16d..4ce6ab3538 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -142,8 +142,8 @@ Select the desired subtitle stream number, counting from 0. The number refers to the list of all the input subtitle streams. If it is greater than the number of subtitle streams minus one, then the last one is selected, if it is negative the subtitle rendering is disabled. -@item -autoexit -Exit when video is done playing. +@item -noautoexit +Do not exit after playback is finished. @item -exitonkeydown Exit if any key is pressed. @item -exitonmousedown |