Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 23:55:58 +0000 (01:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 23:58:14 +0000 (01:58 +0200)
commit1ffbaa88c92b53e72dc4628e35e1f7c39819f31e
tree8385279cc32ef36e1164c9a96688197faaa24061
parent20bc5924a0caadd39e3906301754f4557e29a7fa
parentfce28c3c6d603b7f42a5dbe36bf240d0470469c8
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
  mov: fill in subtitle dimensions after parsing tkhd

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