[FFmpeg-cvslog] Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 13:16:56 2013 +0200| [4f07fcd30b0e910d11e08172549a301beffd7e3a] | committer: Michael Niedermayer

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

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