Merge commit '12789d96'

* commit '12789d96':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
	libavformat/isom.c

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