Browse code
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>
Michael Niedermayer authored on 2014/09/07 03:20:44Showing 2 changed files
| ... | ... |
@@ -142,8 +142,8 @@ Select the desired subtitle stream number, counting from 0. The number |
| 142 | 142 |
refers to the list of all the input subtitle streams. If it is greater |
| 143 | 143 |
than the number of subtitle streams minus one, then the last one is |
| 144 | 144 |
selected, if it is negative the subtitle rendering is disabled. |
| 145 |
-@item -autoexit |
|
| 146 |
-Exit when video is done playing. |
|
| 145 |
+@item -noautoexit |
|
| 146 |
+Do not exit after playback is finished. |
|
| 147 | 147 |
@item -exitonkeydown |
| 148 | 148 |
Exit if any key is pressed. |
| 149 | 149 |
@item -exitonmousedown |