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)
* cehoyos/master:
  Force correct extradata for AVID AVCI50 in mov.

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

Trivial merge