[FFmpeg-cvslog] Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Apr  7 00:28:14 2017 -0300| [8d2c6dc35538c02aea48916353157c8e7678810f] | committer: James Almer

Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'

* commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee':
  avconv: Fix the audio next dts computation

This commit is a noop.

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

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