[FFmpeg-cvslog] Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 12:24:36 2014 +0100| [24af050c2fa9c28c85f68ac5425fc3fbaa826343] | committer: Michael Niedermayer

Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'

* commit '64f7575fbd64e5b65d5c644347408588c776f1fe':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
	libavformat/mov.c

See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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