aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2015-01-09 02:13:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-09 17:18:41 +0100
commit1b3332659a77c8167b1d4328a88ff4ae2498147e (patch)
tree6c41b70a7600a52747e7abb179010898815718e9
parent07c9df792cd4ee1c13243ea5c27d0a64b13e9d80 (diff)
downloadffmpeg-1b3332659a77c8167b1d4328a88ff4ae2498147e.tar.gz
vp9: fix parser return values in error case
The parser must always set the out_size and out_data pointers. The API seems to require it, and the common code in parser.c also relies on it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b88e80589bd11ef935a5e9dab53d4edb00de16e4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vp9_parser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp9_parser.c b/libavcodec/vp9_parser.c
index af033c25e6..922f36f381 100644
--- a/libavcodec/vp9_parser.c
+++ b/libavcodec/vp9_parser.c
@@ -77,6 +77,8 @@ static int parse(AVCodecParserContext *ctx,
idx += a; \
if (sz > size) { \
s->n_frames = 0; \
+ *out_size = 0; \
+ *out_data = data; \
av_log(avctx, AV_LOG_ERROR, \
"Superframe packet size too big: %u > %d\n", \
sz, size); \