diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index e47db0d2c1..3eecb562e4 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -64,7 +64,8 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
             avcodec_set_dimensions(s->avctx, 16*cols, 16*rows);
             return 2;
         }
-    }
+    } else if (!s->macroblocks)
+        return 0;
     return 1;
 }