[FFmpeg-cvslog] Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 29 16:17:36 2015 +0100| [2ee89553aafee6b8f8df0e7f602ac331ceeded3e] | committer: Hendrik Leppkes

Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ee89553aafee6b8f8df0e7f602ac331ceeded3e
---