Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:26:09 +0000 (14:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:26:40 +0000 (14:26 +0200)
commitd3ff77023e941e56242297071c1d8074490ed70a
treece5cbb2681fffa9cd6f444208c7c17c3e9020892
parentb32a6da100a55f35b7dcb9577270b48d2fff4ef9
parent5b41eb91e0083755de8c35e8cd005896ec3ab31f
Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'

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

Conflicts:
libavformat/mov.c

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