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 /COPYING.GPLv3 | |
| 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>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions