                                 "an image! '%s'", frame)
  
              yield filename, image, detected_faces
  
      def detect_faces(self, filename):
          """ Extract the face from a frame (If not alignments file found) """
          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"]
 
</s> remove         image = self.images.load_one_image(filename)
 </s> add  </s> remove         return image, detected_faces
 </s> add         return detected_faces </s> remove     def alignments_faces(self, filename, frame):
 </s> add     def alignments_faces(self, frame, image): </s> remove         src = os.path.join(self.folder, filename)
        logger.trace("Loading image: '%s'", src)
        image = cv2.imread(src)  # pylint: disable=no-member
 </s> add         if self.vid_cap:
            image = self.load_video_frame(filename)
        else:
            src = os.path.join(self.folder, filename)
            logger.trace("Loading image: '%s'", src)
            image = cv2.imread(src)  # pylint: disable=no-member
        return image

    def load_video_frame(self, filename):
        """ Load a requested frame from video """
        frame = os.path.splitext(filename)[0]
        logger.trace("Loading video frame: '%s'", frame)
        frame_no = int(frame[frame.rfind("_") + 1:])
        self.vid_cap.set(cv2.CAP_PROP_POS_FRAMES, frame_no)  # pylint: disable=no-member
        _, image = self.vid_cap.read() </s> remove         return image, detected_faces
 </s> add         return detected_faces
    @staticmethod
    def detect_faces(filename, image):
                                 "an image! '%s'", frame)
  
              yield filename, image, detected_faces
  
    @staticmethod
    def detect_faces(filename, image):
          """ Extract the face from a frame (If not alignments file found) """
          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"]
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