[FFmpeg-cvslog] Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep  6 20:20:44 2014 +0200| [f9bc65e399d1883da21ae03d07b09348a11a5f49] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9bc65e399d1883da21ae03d07b09348a11a5f49
---