diff options
| author | Keiji Costantini <strites@gmail.com> | 2014-03-01 19:44:00 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-08 19:34:29 -0500 |
| commit | db67b7c31b6fdd3747e2b5328945ad2091533698 (patch) | |
| tree | 9b751b3f441a8512b81c77843a53d28d6f9e3133 | |
| parent | a643a47d41f4924b66fce339e4b82aaee20825be (diff) | |
| download | ffmpeg-db67b7c31b6fdd3747e2b5328945ad2091533698.tar.gz | |
rv10: Forward error from rv10_decode_packet
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13)
| -rw-r--r-- | libavcodec/rv10.c | 5 |
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++; } |