Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:16:56 +0000 (13:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:21:34 +0000 (13:21 +0200)
commit4f07fcd30b0e910d11e08172549a301beffd7e3a
treefe1cc9d566094c2d675926698e3843891812313e
parent56e682374ecd78daac42a6e0fc5da799c0d3786b
parent7748dd41be3d6dd6300f14263586af4ee104ead2
Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'

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

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg_opt.c

See: 0a4f02117b67c135a27e3490aea1631ad9f4312f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt.c