diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-23 22:36:11 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-24 16:17:42 +0100 |
| commit | 9767ea7aa77a331f73268758af2e1858222f5915 (patch) | |
| tree | c645909eee53bebdb6ef25192cd4843c1eb1c8cf | |
| parent | 771ceb19f293df9a447d38820f4def8f58aa0b2e (diff) | |
| download | ffmpeg-9767ea7aa77a331f73268758af2e1858222f5915.tar.gz | |
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>
(cherry picked from commit a72cad0a6c05aa74940101e937cb3dc602d7d67b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit c76505e0dee0890e39636ddebd2707ab3ea5b8de)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e28bb18fdc894dfdc1befa9f5e748ccb649a8c76)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/vp6.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index d16a13eba0..288227b174 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -136,8 +136,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); |