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)
commit28f7b81f9b00ff7e7096e6d2415ddfd118c7b6e8
tree8e1ea78831ffd578d0a49a1cd5f9f9cb8dbd03f0
parente692c9672b28230419c912f90f4f3852cdd71dd0
parent26b0d7198e23ca6d0538ad7da1c383a146a4bf1a
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Read mov files where the moov atom is hidden within a free atom.

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