diff options
author | James Almer <jamrial@gmail.com> | 2017-04-07 00:28:14 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-04-07 00:28:14 -0300 |
commit | 8d2c6dc35538c02aea48916353157c8e7678810f (patch) | |
tree | 5848f3a2f2b94d4ee35edb08f499da925bd3abb6 /libavformat/acm.c | |
parent | b0f67d03c50fcfc5abf08bc538484af60b147f78 (diff) | |
parent | d0c84c41d33ffd270d5f9fe0290e08341397fdee (diff) | |
download | ffmpeg-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