Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 03:23:57 +0000 (04:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 03:24:02 +0000 (04:24 +0100)
* cehoyos/master:
  Allow decoding of slightly broken Nikon avi files.

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

Trivial merge