Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Sep 2014 18:20:44 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Sep 2014 18:23:29 +0000 (20:23 +0200)
commitf9bc65e399d1883da21ae03d07b09348a11a5f49
treeb28bcc92bbb5a2d364518d8b3c71dfdbe9d4e1df
parentb76d6eb3bd70b38c1d02b257462bc7ed102550fb
parent041caf1a63f091745b95a6d51c23fbdcb604d4ce
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>
Changelog
doc/ffplay.texi