Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 22:08:10 +0000 (00:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 22:12:24 +0000 (00:12 +0200)
commit13eed267f8c140ca3d69a7a716b917ec7dd77d97
treec126ec2288a2680a698be06658a3033a3bb95593
parent38b701a3492446d7601336c4938fed2b822aa163
parent31931520df35a6f9606fe8293c8a39e2d1fabedf
Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'

* commit '31931520df35a6f9606fe8293c8a39e2d1fabedf':
  mov: Do not allow updating the time scale after it has been set

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