Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 May 2014 15:24:18 +0000 (17:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 May 2014 15:24:23 +0000 (17:24 +0200)
* cehoyos/master:
  Read mov files where the moov atom is hidden within a free atom.

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

Trivial merge