Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 11:04:46 +0000 (13:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 11:04:51 +0000 (13:04 +0200)
commit694550f18e026c1d7736a40961d080ec32a4c31b
treebc105a1dbd305b42346fdb5b25e1aacd08f6db75
parent0dd99628ea15f1fe7121b8a983c0b1fe57660027
parent9a1ec1f2f223b19f5ce574c3683ac6827fe93633
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force correct extradata for AVID AVCI50 in mov.

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