Module: libav Branch: release/10 Commit: db67b7c31b6fdd3747e2b5328945ad2091533698
Author: Keiji Costantini <stri...@gmail.com> Committer: Reinhard Tartler <siret...@tauware.de> Date: Sat Mar 1 19:44:00 2014 +0100 rv10: Forward error from rv10_decode_packet Signed-off-by: Diego Biurrun <di...@biurrun.de> (cherry picked from commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13) --- libavcodec/rv10.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ae8c5b3..51affa8 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++; } _______________________________________________ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits