summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 16:04:46 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 16:04:46 +0100
commit28765693955fcfb843009b834d4e2a4fe0211526 (patch)
tree9fbaa2eada2ec139eaa7c2127494ef37bd2d81c2
parent5c0dbc20fceb04ffd129983ba6717230137efec5 (diff)
parent99cb833fc2d9874c62fffbcd3347fae660de0fe5 (diff)
downloadffmpeg-streaming-28765693955fcfb843009b834d4e2a4fe0211526.zip
ffmpeg-streaming-28765693955fcfb843009b834d4e2a4fe0211526.tar.gz
Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5'
* commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5': sgi: Correctly propagate meaningful error values Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--libavcodec/sgienc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index b150178..d631e23 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -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);
OpenPOWER on IntegriCloud