commit 9767ea7aa77a331f73268758af2e1858222f5915
author Laurent Aimar <fenrir@videolan.org> Fri Sep 23 22:36:11 2011 +0200
committer Reinhard Tartler <siretart@tauware.de> Sat Dec 24 16:17:42 2011 +0100
tree c645909eee53bebdb6ef25192cd4843c1eb1c8cf
parent 771ceb19f293df9a447d38820f4def8f58aa0b2e

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>

libavcodec/vp6.c

diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index d16a13e..288227b 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -136,8 +136,11 @@
     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);