Merge commit '5c337353a2546416631a87de4881850d99141c39'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 12:26:44 +0000 (13:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 12:26:47 +0000 (13:26 +0100)
commit25d7e3ad594a8b5ed1b840d75185df34efdde6ad
treefc24fcd728f6a81ff8f4050018b45a6e2db41178
parent3602782429ef3fceafd78c52014088655e4256a4
parent5c337353a2546416631a87de4881850d99141c39
Merge commit '5c337353a2546416631a87de4881850d99141c39'

* commit '5c337353a2546416631a87de4881850d99141c39':
  movenc: Move sidx edit list timestamp adjustment into a block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c