Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'
authorJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:28:14 +0000 (00:28 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:28:14 +0000 (00:28 -0300)
* commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee':
  avconv: Fix the audio next dts computation

This commit is a noop.

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

Trivial merge