mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '7748dd41be3d6dd6300f14263586af4ee104ead2':
avconv: add -n option to immediately exit when output files already exist
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg_opt.c
See: 0a4f02117b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/37/head
commit
4f07fcd30b
1 changed files with 8 additions and 3 deletions
Loading…
Reference in new issue