[FFmpeg-cvslog] Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 00:35:39 2015 +0200| [348319f5438fa2117cf19c42317a7d7875876981] | committer: Michael Niedermayer

Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
	libavformat/mov.c

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

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