[FFmpeg-cvslog] Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
Michael Niedermayer
git at videolan.org
Tue Aug 6 11:51:47 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 6 10:57:04 2013 +0200| [7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448] | committer: Michael Niedermayer
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
avconv: make input -ss accurate when transcoding
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448
---
More information about the ffmpeg-cvslog
mailing list