[FFmpeg-cvslog] Merge commit '3e265ca58f0505470186dce300ab66a6eac3978e'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 17:23:57 2016 +0100| [f761d4967053352f9b95ac2bc2505ea06d25a2a0] | committer: Hendrik Leppkes

Merge commit '3e265ca58f0505470186dce300ab66a6eac3978e'

* commit '3e265ca58f0505470186dce300ab66a6eac3978e':
  avconv: do packet ts rescaling in write_packet()

This commit is a noop since it doesn't apply cleanly due to differences
in the dataflow between avconv and ffmpeg, and thus fixing this in the
scope of a merge is unfeasible.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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