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)
* commit '5c337353a2546416631a87de4881850d99141c39':
  movenc: Move sidx edit list timestamp adjustment into a block

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

Simple merge