[FFmpeg-cvslog] Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 02:08:45 2014 +0200| [46ff8108f6b4bb3c74c476ddcbb4c92ad928a202] | committer: Michael Niedermayer

Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'

* 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 at gmx.at>

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