[FFmpeg-cvslog] Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 12 00:50:24 2017 -0300| [ab77c4007b2f662125698569cb2bac2c48851282] | committer: James Almer

Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'

* commit '22241208eb7d0168b2afc128af5a128a9ef0a89b':
  avconv.c: fix calculation of input file duration in seek_to_start()

This commit is a noop, see 3ddb887c88483ce089b29a30d0d0aa574c8cdc66

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab77c4007b2f662125698569cb2bac2c48851282
---