Merge commit 'eee13d653953083553cceadbbedf6222ef78a006'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:47:15 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:47:19 +0000 (12:47 +0100)
* commit 'eee13d653953083553cceadbbedf6222ef78a006':
  movenc: Only adjust the cts offset at the start of fragments if necessary

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

Simple merge