[FFmpeg-cvslog] Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 29 16:04:46 2015 +0100| [28765693955fcfb843009b834d4e2a4fe0211526] | committer: Hendrik Leppkes

Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5'

* commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5':
  sgi: Correctly propagate meaningful error values

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

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