Merge commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:43:38 +0000 (22:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:44:46 +0000 (22:44 +0100)
* commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7':
  mxf: Correctly support files from Pinnacle Thunder

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

Trivial merge