diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 10:57:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 11:39:09 +0200 |
| commit | 7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448 (patch) | |
| tree | 0d3d52781eddded7a49501bce8948f9bcf570b9b /doc/formats.texi | |
| parent | 3fa72de82f04802e307085d3fce9eafea1d3dc46 (diff) | |
| parent | 811bd0784679dfcb4ed02043a37c92f9df10500e (diff) | |
| download | ffmpeg-7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448.tar.gz | |
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@gmx.at>
Diffstat (limited to 'doc/formats.texi')
0 files changed, 0 insertions, 0 deletions