Commit f9bc65e3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '041caf1a'

* commit '041caf1a':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b76d6eb3 041caf1a
...@@ -14,6 +14,7 @@ version <next>: ...@@ -14,6 +14,7 @@ version <next>:
- Matroska 3D support thorugh side data - Matroska 3D support thorugh side data
- HTML generation using texi2html is deprecated in favor of makeinfo/texi2any - HTML generation using texi2html is deprecated in favor of makeinfo/texi2any
- silenceremove filter - silenceremove filter
- ffplay now exits by default at the end of playback
version 2.3: version 2.3:
......
...@@ -142,8 +142,8 @@ Select the desired subtitle stream number, counting from 0. The number ...@@ -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 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 than the number of subtitle streams minus one, then the last one is
selected, if it is negative the subtitle rendering is disabled. selected, if it is negative the subtitle rendering is disabled.
@item -autoexit @item -noautoexit
Exit when video is done playing. Do not exit after playback is finished.
@item -exitonkeydown @item -exitonkeydown
Exit if any key is pressed. Exit if any key is pressed.
@item -exitonmousedown @item -exitonmousedown
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment