Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:50:24 +0000 (00:50 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:50:24 +0000 (00:50 -0300)
commitab77c4007b2f662125698569cb2bac2c48851282
treec94d264d85bea3a917d2b1e554ef84db9ab0f144
parentf5c67c431ef9d60deb6451d6499e10b9ad510335
parent22241208eb7d0168b2afc128af5a128a9ef0a89b
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@gmail.com>