[FFmpeg-cvslog] Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
Michael Niedermayer
git at videolan.org
Thu Apr 11 22:04:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 21:49:26 2013 +0200| [647fe2e77733edf6e3a15c490056211bc38ccc20] | committer: Michael Niedermayer
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
img2enc: add an option for overwriting one file with subsequent images
Conflicts:
doc/muxers.texi
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=647fe2e77733edf6e3a15c490056211bc38ccc20
---
More information about the ffmpeg-cvslog
mailing list