aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-12-15 21:08:48 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-08-23 13:15:16 +0200
commit25e65de35e553d89bc284b892afc06ee8ff8061b (patch)
tree4d16dfc9f62665e91bfc3fb239481a5132c804de
parent269ef77f2afe466b3bb5cbad609cd92c241c475f (diff)
downloadffmpeg-25e65de35e553d89bc284b892afc06ee8ff8061b.tar.gz
avcodec/vp3: Do not return random positive values but the buf size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d8094a303ba36344015a44d629bafc6d7094b4ac) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vp3.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index b3aaf4e22d..d23ed375f6 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2014,16 +2014,18 @@ static int vp3_decode_frame(AVCodecContext *avctx,
ret = vp3_decode_init(avctx);
if (ret < 0) {
vp3_decode_end(avctx);
+ return ret;
}
- return ret;
+ return buf_size;
} else if (type == 2) {
ret = theora_decode_tables(avctx, &gb);
if (ret >= 0)
ret = vp3_decode_init(avctx);
if (ret < 0) {
vp3_decode_end(avctx);
+ return ret;
}
- return ret;
+ return buf_size;
}
av_log(avctx, AV_LOG_ERROR,