aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-01 13:16:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-01 13:21:34 +0200
commit4f07fcd30b0e910d11e08172549a301beffd7e3a (patch)
treefe1cc9d566094c2d675926698e3843891812313e /libavfilter/version.h
parent56e682374ecd78daac42a6e0fc5da799c0d3786b (diff)
parent7748dd41be3d6dd6300f14263586af4ee104ead2 (diff)
downloadffmpeg-4f07fcd30b0e910d11e08172549a301beffd7e3a.tar.gz
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>
Diffstat (limited to 'libavfilter/version.h')
0 files changed, 0 insertions, 0 deletions