[FFmpeg-cvslog] Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 14:26:09 2013 +0200| [d3ff77023e941e56242297071c1d8074490ed70a] | committer: Michael Niedermayer

Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'

* commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f':
  mov: Parse tmcd extradata

Conflicts:
	libavformat/mov.c

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

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