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)
commit8d2c6dc35538c02aea48916353157c8e7678810f
tree5848f3a2f2b94d4ee35edb08f499da925bd3abb6
parentb0f67d03c50fcfc5abf08bc538484af60b147f78
parentd0c84c41d33ffd270d5f9fe0290e08341397fdee
Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'

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

This commit is a noop.

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