Merge commit '39523030108815242178ac5e209c83070bd1baef'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:16:31 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:16:31 +0000 (12:16 +0200)
commit4a6f1be170a057ee3d582e5f110ed659926c093c
treefe4a945dcd5272bc828e1387e43b8a83d282e11a
parente1acfd3cb0543815316ede06232d13e002562daa
parent39523030108815242178ac5e209c83070bd1baef
Merge commit '39523030108815242178ac5e209c83070bd1baef'

* commit '39523030108815242178ac5e209c83070bd1baef':
  mov: Set the timescale for data streams

Conflicts:
libavformat/movenc.c

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