diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:03:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:03:17 +0100 |
| commit | 46f8d838b37cf9180ebad352efd7cc76382cd093 (patch) | |
| tree | c00806ee1cd0ac8bb70f5edb71246e8ca6853bb2 | |
| parent | bc3648d4b476562fcf7740bec2d58385fa97378d (diff) | |
| parent | db67b7c31b6fdd3747e2b5328945ad2091533698 (diff) | |
| download | ffmpeg-46f8d838b37cf9180ebad352efd7cc76382cd093.tar.gz | |
Merge commit 'db67b7c31b6fdd3747e2b5328945ad2091533698' into release/2.2
* commit 'db67b7c31b6fdd3747e2b5328945ad2091533698':
rv10: Forward error from rv10_decode_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 fc3fb722f8..cf13b9b0c1 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -730,7 +730,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++; } |