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)
commit4014b401b0d55f27b7c430962b63f6b3fbf834c5
treeaa3997c301c7b7fd542f2f35015cfd152538d33a
parenta493f8541de20e76073433f39f66da31f3834bc4
parentf9c2d4d17e3b18becb046d71811f9e8aa5946cf9
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow decoding of slightly broken Nikon avi files.

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