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)
commiteec75e0a1fc952d5ca31de8f5c8d934cfa52edf2
treef78072a96f280976a881414c3aa703267a1e85ad
parent4a6f1be170a057ee3d582e5f110ed659926c093c
parent22de0f8369f1f3edf1a55e1d275f3c07c617b53e
Merge commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e'

* commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e':
  mov: Compute max duration among the tracks with a timescale

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