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)
commite862a433d8e33787dd2ce14783e3afc511671d9f
tree7eb65d1613f1be430b28c050ad906ad725ed8065
parent93dfc4f174d89ad4c9a76fb542ddfed138e4f01b
parent82989bd98c7f4e87f59af2147b645b8fd8f31c53
Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'

* commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53':
  avconv: Move rescale to stream timebase before monotonisation

This commit is a noop, see 4ee5aed122ba7d289c1686eca6eba161d5d62304

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