diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 00:57:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 00:59:00 +0100 |
| commit | 0c1353ae338bac9a0c4052805f56f02952172223 (patch) | |
| tree | 3eba6944e9f2b48432c33a83cef95d9c5cf6a099 /libavcodec/rv10.c | |
| parent | 17a5dbacf50cafbf4034732ad09f252c076bf26c (diff) | |
| parent | b4d372e091f6b30758db2a43a5a9fe2510ec2b13 (diff) | |
| download | ffmpeg-0c1353ae338bac9a0c4052805f56f02952172223.tar.gz | |
Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'
* commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13':
rv10: Forward error from rv10_decode_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv10.c')
| -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++; } |