Merge commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:25:28 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:34:54 +0000 (12:34 +0200)
* commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e':
  mov: Compute max duration among the tracks with a timescale

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

Simple merge