Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:17:36 +0000 (16:17 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:17:36 +0000 (16:17 +0100)
commit2ee89553aafee6b8f8df0e7f602ac331ceeded3e
treeab2c93b149d7112dd17a7123f63a9f263dfda6da
parent2e4d10ae553a867a222d4e4e0a0dfd1dc1b70b97
parent0e2395293bff089536b97131b32fea8b58bca0ba
Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'

* commit '0e2395293bff089536b97131b32fea8b58bca0ba':
  nut: Mark non-fatal errors as warnings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/nutdec.c