]> git.sesse.net Git - ffmpeg/commitdiff
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>
libavcodec/sgienc.c

index b150178addf2e29f32a6ced7a2a7af6f2fe6ff58..d631e23656421b962e4426f7171ab75bc0622caf 100644 (file)
@@ -207,7 +207,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
                                         bytes_per_channel);
                 if (length < 1) {
                     av_free(encode_buf);
-                    return -1;
+                    return AVERROR_INVALIDDATA;
                 }
 
                 bytestream2_put_be32(&tablen_pcb, length);