summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeiji Costantini <strites@gmail.com>2014-03-01 19:44:00 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-08 17:19:56 +0100
commitb4d372e091f6b30758db2a43a5a9fe2510ec2b13 (patch)
treee7c479dd18ebdd25be5d6eb0627eefdef3bfdecc
parenta801453423420915425f902bf9f9cbe982a55d87 (diff)
downloadffmpeg-b4d372e091f6b30758db2a43a5a9fe2510ec2b13.tar.gz
rv10: Forward error from rv10_decode_packet
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libavcodec/rv10.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index ae8c5b34e9..51affa8769 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -707,7 +707,10 @@ static int rv10_decode_frame(AVCodecContext *avctx,
offset + FFMAX(size, size2) > buf_size)
return AVERROR_INVALIDDATA;
- if (rv10_decode_packet(avctx, buf + offset, size, size2) > 8 * size)
+ if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2)) < 0)
+ return ret;
+
+ if (ret > 8 * size)
i++;
}