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

Merge commit '7748dd41' 


* commit '7748dd41':
  avconv: add -n option to immediately exit when output files already exist

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg_opt.c

See: 0a4f0211
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 56e68237 7748dd41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment