Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:04:46 +0000 (16:04 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:04:46 +0000 (16:04 +0100)
* commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5':
  sgi: Correctly propagate meaningful error values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/sgienc.c

Simple merge