diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:26:44 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:26:47 +0100 |
commit | 25d7e3ad594a8b5ed1b840d75185df34efdde6ad (patch) | |
tree | fc24fcd728f6a81ff8f4050018b45a6e2db41178 /libswresample/version.h | |
parent | 3602782429ef3fceafd78c52014088655e4256a4 (diff) | |
parent | 5c337353a2546416631a87de4881850d99141c39 (diff) | |
download | ffmpeg-25d7e3ad594a8b5ed1b840d75185df34efdde6ad.tar.gz |
Merge commit '5c337353a2546416631a87de4881850d99141c39'
* commit '5c337353a2546416631a87de4881850d99141c39':
movenc: Move sidx edit list timestamp adjustment into a block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/version.h')
0 files changed, 0 insertions, 0 deletions