[FFmpeg-cvslog] avcodec/4xm: Fix returned error codes
Michael Niedermayer
git at videolan.org
Thu Mar 21 20:13:58 EET 2019
ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Mon Dec 31 18:11:44 2018 +0100| [96ef96f6ba8f43e00b631506b78fc6afcbe4e3f8] | committer: Michael Niedermayer
avcodec/4xm: Fix returned error codes
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 07607a1db879d0d96e2c91e1354bc4e425937d3a)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96ef96f6ba8f43e00b631506b78fc6afcbe4e3f8
---
libavcodec/4xm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 5547dfd87f..8e05a4c366 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -498,7 +498,7 @@ static int decode_i_block(FourXContext *f, int16_t *block)
if (get_bits_left(&f->gb) < 2){
av_log(f->avctx, AV_LOG_ERROR, "%d bits left before decode_i_block()\n", get_bits_left(&f->gb));
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* DC coef */
@@ -732,7 +732,7 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
for (x = 0; x < width; x += 16) {
unsigned int color[4] = { 0 }, bits;
if (buf_end - buf < 8)
- return -1;
+ return AVERROR_INVALIDDATA;
// warning following is purely guessed ...
color[0] = bytestream2_get_le16u(&g3);
color[1] = bytestream2_get_le16u(&g3);
More information about the ffmpeg-cvslog
mailing list