Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:35:39 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:35:39 +0000 (00:35 +0200)
commit348319f5438fa2117cf19c42317a7d7875876981
treeb2e7d935b82a6f4430fbe68f5cb8f61b7adb1057
parentc2876c0181d170ed9d4d962599f5b65ba4e85178
parenta8a90906fb0ad0f8d3c68a97f182528ee3b5198c
Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c