aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@elivagar.org>2011-09-24 16:19:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-24 19:13:37 +0200
commit91f104496bb7632ed5ff03798e06dd8af014f0d9 (patch)
treec42970b618da5c99d498e5b0e9eed1e14b767fb2
parent57764c699671b32f0c70795feafc0c6d7491f198 (diff)
downloadffmpeg-91f104496bb7632ed5ff03798e06dd8af014f0d9.tar.gz
vp6:Reset the internal state when aborting key frames header parsing in vp6 decoder.
It prevents leaving the state only half initialized. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vp6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 31af095e14..a95e4be5b2 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -139,8 +139,11 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
if (coeff_offset) {
buf += coeff_offset;
buf_size -= coeff_offset;
- if (buf_size < 0)
+ if (buf_size < 0) {
+ if (s->framep[VP56_FRAME_CURRENT]->key_frame)
+ avcodec_set_dimensions(s->avctx, 0, 0);
return 0;
+ }
if (s->use_huffman) {
s->parse_coeff = vp6_parse_coeff_huffman;
init_get_bits(&s->gb, buf, buf_size<<3);