From f4292ebf52fb2e58a1ddbefb06bccd47a38bdc99 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 16 Apr 2015 22:16:04 +0200
Subject: vf_screenshot: remove this filter

It's entirely useless, especially now that vo.c handles screenshots in a
generic way, and requires no special VO support. There are some
potential weird use-cases, but actually I've never seen it being used.
---
 video/filter/vf.c            |  3 --
 video/filter/vf.h            |  1 -
 video/filter/vf_screenshot.c | 74 --------------------------------------------
 3 files changed, 78 deletions(-)
 delete mode 100644 video/filter/vf_screenshot.c

(limited to 'video/filter')

diff --git a/video/filter/vf.c b/video/filter/vf.c
index 888e937fa5..9bbe126823 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -54,7 +54,6 @@ extern const vf_info_t vf_info_hqdn3d;
 extern const vf_info_t vf_info_dsize;
 extern const vf_info_t vf_info_pullup;
 extern const vf_info_t vf_info_delogo;
-extern const vf_info_t vf_info_screenshot;
 extern const vf_info_t vf_info_sub;
 extern const vf_info_t vf_info_yadif;
 extern const vf_info_t vf_info_stereo3d;
@@ -88,8 +87,6 @@ static const vf_info_t *const filter_list[] = {
     &vf_info_yadif,
 #endif
 
-    &vf_info_screenshot,
-
     &vf_info_eq,
     &vf_info_dsize,
     &vf_info_sub,
diff --git a/video/filter/vf.h b/video/filter/vf.h
index f7ee9d011b..76835528b5 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -144,7 +144,6 @@ enum vf_ctrl {
     VFCTRL_SEEK_RESET = 1,   // reset on picture and PTS discontinuities
     VFCTRL_SET_EQUALIZER,    // set color options (brightness,contrast etc)
     VFCTRL_GET_EQUALIZER,    // get color options (brightness,contrast etc)
-    VFCTRL_SCREENSHOT,       // Take screenshot, arg is mp_image**
     VFCTRL_INIT_OSD,         // Filter OSD renderer present?
     VFCTRL_SET_DEINTERLACE,  // Set deinterlacing status
     VFCTRL_GET_DEINTERLACE,  // Get deinterlacing status
diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c
deleted file mode 100644
index 57cd9fbb0b..0000000000
--- a/video/filter/vf_screenshot.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "talloc.h"
-
-#include "video/img_format.h"
-#include "video/mp_image.h"
-#include "video/sws_utils.h"
-#include "video/out/vo.h"
-
-#include "vf.h"
-
-struct vf_priv_s {
-    struct mp_image *current;
-};
-
-static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
-{
-    mp_image_unrefp(&vf->priv->current);
-    vf->priv->current = talloc_steal(vf, mp_image_new_ref(mpi));
-    return mpi;
-}
-
-static int control (vf_instance_t *vf, int request, void *data)
-{
-    if (request == VFCTRL_SCREENSHOT && vf->priv->current) {
-        *(struct mp_image **)data = mp_image_new_ref(vf->priv->current);
-        return CONTROL_TRUE;
-    }
-    return CONTROL_UNKNOWN;
-}
-
-static int query_format(struct vf_instance *vf, unsigned int fmt)
-{
-    if (mp_sws_supported_format(fmt))
-        return vf_next_query_format(vf, fmt);
-    return 0;
-}
-
-static int vf_open(vf_instance_t *vf)
-{
-    vf->control = control;
-    vf->filter = filter;
-    vf->query_format = query_format;
-    vf->priv = talloc_zero(vf, struct vf_priv_s);
-    return 1;
-}
-
-const vf_info_t vf_info_screenshot = {
-    .description = "screenshot to file",
-    .name = "screenshot",
-    .open = vf_open,
-};
-- 
cgit v1.2.3