[FFmpeg-cvslog] Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 00:52:02 2017 -0300| [e862a433d8e33787dd2ce14783e3afc511671d9f] | committer: James Almer

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 at gmail.com>

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