From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 9 Jul 2013 11:04:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'cehoyos/master'
X-Git-Tag: n2.0~21
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/694550f18e026c1d7736a40961d080ec32a4c31b

Merge remote-tracking branch 'cehoyos/master'

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

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

694550f18e026c1d7736a40961d080ec32a4c31b