Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 08:57:04 +0000 (10:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 09:39:09 +0000 (11:39 +0200)
commit7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448
tree0d3d52781eddded7a49501bce8948f9bcf570b9b
parent3fa72de82f04802e307085d3fce9eafea1d3dc46
parent811bd0784679dfcb4ed02043a37c92f9df10500e
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>
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c