OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a801453
)
rv10: Forward error from rv10_decode_packet
author
Keiji Costantini
<strites@gmail.com>
Sat, 1 Mar 2014 18:44:00 +0000
(19:44 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Sat, 8 Mar 2014 16:19:56 +0000
(17:19 +0100)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
libavcodec/rv10.c
patch
|
blob
|
history
diff --git
a/libavcodec/rv10.c
b/libavcodec/rv10.c
index
ae8c5b3
..
51affa8
100644
(file)
--- 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++;
}