diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 14:00:32 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 14:00:39 +0100 |
commit | 5440d4b68b6af942ea460f0eb391b7f2442b5f50 (patch) | |
tree | aec11df5505179d4e597589791d110bf3053c6fa /libswresample/arm | |
parent | b5448e66b0b88da95a3c8f08a2b2d416049585a5 (diff) | |
parent | 30a041887f89cd97c372ad6a516da6e012f2c88b (diff) | |
download | ffmpeg-5440d4b68b6af942ea460f0eb391b7f2442b5f50.tar.gz |
Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'
* commit '30a041887f89cd97c372ad6a516da6e012f2c88b':
ismindex: Calculate the pts duration of trun atoms, not the dts duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions