ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Sat Dec
20 12:35:43 2014 +0100| [ede5946b709513b84e12c6afd6f963e9304214f5] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ede5946b709513b84e12c6afd6f963e9304214f5
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog