Changeset 4f07fcd3 in ffmpeg

Timestamp:

Aug 1, 2013, 11:21:34 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2ee58af5

Parents:

56e68237 (diff), 7748dd41 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:16:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:21:34)

Message:

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>

(No files)