aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/acm.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-07 00:28:14 -0300
committerJames Almer <jamrial@gmail.com>2017-04-07 00:28:14 -0300
commit8d2c6dc35538c02aea48916353157c8e7678810f (patch)
tree5848f3a2f2b94d4ee35edb08f499da925bd3abb6 /libavformat/acm.c
parentb0f67d03c50fcfc5abf08bc538484af60b147f78 (diff)
parentd0c84c41d33ffd270d5f9fe0290e08341397fdee (diff)
downloadffmpeg-8d2c6dc35538c02aea48916353157c8e7678810f.tar.gz
Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'
* commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee': avconv: Fix the audio next dts computation This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/acm.c')
0 files changed, 0 insertions, 0 deletions