[SCM] libav/experimental: rv10: Forward error from rv10_decode_packet

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:01:51 UTC 2014


The following commit has been merged in the experimental branch:
commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13
Author: Keiji Costantini <strites at gmail.com>
Date:   Sat Mar 1 19:44:00 2014 +0100

    rv10: Forward error from rv10_decode_packet
    
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

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/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list