Merge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:20:28 +0000 (22:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:20:32 +0000 (22:20 +0100)
commit522c7c37d23538183d94e960dcb9160441726124
tree302cec5ae717ec4a5c113c900f115047b508feec
parent525689ede90699df29aaa700fb45fd5659d4ce4e
parent0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48
Merge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10

* commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48':
  mov: avoid a memleak when multiple stss boxes are present

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