[FFmpeg-cvslog] Merge commit '577f1feb3fd1e51fd14af7ce6d79d468faa3b929' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 11:48:28 2014 +0100| [36e6842aa63f9cbad3399b26b871589d1258ee43] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36e6842aa63f9cbad3399b26b871589d1258ee43
---