Skip to content
Snippets Groups Projects
Commit f9bc65e3 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b76d6eb3 041caf1a
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment