[FFmpeg-cvslog] rv10: Forward error from rv10_decode_packet

[Keiji Costantini]

ffmpeg | branch: release/2.2 | Keiji Costantini <strites at gmail.com> | Sat Mar  1 19:44:00 2014 +0100| [db67b7c31b6fdd3747e2b5328945ad2091533698] | committer: Reinhard Tartler

rv10: Forward error from rv10_decode_packet

Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db67b7c31b6fdd3747e2b5328945ad2091533698
---

 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++;
     }