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)
commite70e2583d07188b6508cfb097ab222afd6b08d11
treeac08f76114459ede36e338957be0509b2c560388
parent2dedd8988a12eb088dad418bea9f71e791a27336
parent231b3317184790b6be4b4619d96fd328f13aeabb
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

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