summaryrefslogtreecommitdiff
path: root/libavcodec/vp6.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-23 22:36:11 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-10-07 00:37:32 +0200
commita72cad0a6c05aa74940101e937cb3dc602d7d67b (patch)
tree7c6d09b781a515644eaebef066b373c2cdefd2a5 /libavcodec/vp6.c
parent3d09d0017d10a0d738141a955c75c555133e41b2 (diff)
vp6: Reset the internal state when aborting key frames header parsing
It prevents leaving the state only half initialized. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/vp6.c')
-rw-r--r--libavcodec/vp6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 6928a91a05..e29f9014aa 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);