Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 11:25:06 +0000 (13:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 11:25:12 +0000 (13:25 +0200)
* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

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

Trivial merge