diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:35:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:36:00 +0100 |
| commit | ede5946b709513b84e12c6afd6f963e9304214f5 (patch) | |
| tree | 449db5c8b1338c9201b33963443b892a16c644b1 /doc/examples | |
| parent | 3cd2c33d36cb5cfe64ca43295f9e592de753f244 (diff) | |
| parent | 931f5b235112f1c2a09dead36f0a228061d23942 (diff) | |
| download | ffmpeg-ede5946b709513b84e12c6afd6f963e9304214f5.tar.gz | |
Merge commit '931f5b235112f1c2a09dead36f0a228061d23942' into release/2.2
* commit '931f5b235112f1c2a09dead36f0a228061d23942':
mov: avoid a memleak when multiple stss boxes are present
Conflicts:
libavformat/mov.c
See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions