Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:52:02 +0000 (00:52 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:52:02 +0000 (00:52 -0300)
* commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53':
  avconv: Move rescale to stream timebase before monotonisation

This commit is a noop, see 4ee5aed122ba7d289c1686eca6eba161d5d62304

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

Trivial merge