Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Mar 2014 00:08:45 +0000 (02:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Mar 2014 00:10:01 +0000 (02:10 +0200)
* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
libavformat/isom.c

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

Trivial merge