          image = self.images.load_one_image(filename)
          queue_manager.get_queue("load").put((filename, image))
          item = queue_manager.get_queue("align").get()
          detected_faces = item["detected_faces"]
          return image, detected_faces
  
      def alignments_faces(self, filename, frame):
          """ Get the face from alignments file """
          if not self.check_alignments(frame):
              return None
 
</s> remove     def alignments_faces(self, filename, frame):
 </s> add     def alignments_faces(self, frame, image): </s> remove         image = self.images.load_one_image(filename)
 </s> add  </s> remove     def detect_faces(self, filename):
 </s> add     @staticmethod
    def detect_faces(filename, image): </s> remove         image = self.images.load_one_image(filename)
 </s> add  </s> remove         return image, detected_faces
 </s> add         return detected_faces
        return detected_faces
          image = self.images.load_one_image(filename)
          queue_manager.get_queue("load").put((filename, image))
          item = queue_manager.get_queue("align").get()
          detected_faces = item["detected_faces"]
        return detected_faces
  
      def alignments_faces(self, filename, frame):
          """ Get the face from alignments file """
          if not self.check_alignments(frame):
              return None
keep keep keep keep replace keep keep keep keep keep
 Add ability to extract from and convert from a video file (#559)

* Add ability to extract from and convert from a video file

* Update cli helptext. Add filebrowser button for GUI input

* Add video support to Alignments Tool 
scripts/convert.py