diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 11:48:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 11:49:03 +0100 |
| commit | 36e6842aa63f9cbad3399b26b871589d1258ee43 (patch) | |
| tree | 12e966eb283b7f5346b07dc1dd7c1974a0a7a3a2 /libavutil/arm/float_dsp_init_neon.c | |
| parent | 47e4a1ac6d1c0ed32f28ed6922ce9a08965f4473 (diff) | |
| parent | 577f1feb3fd1e51fd14af7ce6d79d468faa3b929 (diff) | |
| download | ffmpeg-36e6842aa63f9cbad3399b26b871589d1258ee43.tar.gz | |
Merge commit '577f1feb3fd1e51fd14af7ce6d79d468faa3b929' into release/2.4
* commit '577f1feb3fd1e51fd14af7ce6d79d468faa3b929':
mov: avoid a memleak when multiple stss boxes are present
Conflicts:
libavformat/mov.c
See: 1b5d11240692025f036e945bc37968735679320a
See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_neon.c')
0 files changed, 0 insertions, 0 deletions