summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-30 01:17:33 +0100
committerwm4 <wm4@nowhere>2013-01-30 23:41:22 +0100
commitfd5637888ac5f6be60d2aac843afe5235930214a (patch)
tree920f640b19225493ed4eba8a8d1698f4ffec7d76 /video
parentcfc3f10bda14e5ea42365776dc005e8f9cb09d64 (diff)
downloadmpv-fd5637888ac5f6be60d2aac843afe5235930214a.tar.bz2
mpv-fd5637888ac5f6be60d2aac843afe5235930214a.tar.xz
screenshot: minor simplification, prefer VF over VO
Remove screenshot_force and associated logic. Always try to use the screenshot video filter before trying taking screenshots with the VO, which means that --vf=screenshot now takes the role of --vf=screenshot_force. (To make this clear, not adding a video filter is still the recommended way to take screenshots; we just change how VF screenshots are forced.) Preferring VO over VF and having --vf=screenshot_force used to make sense when not all VOs supported screenshots, and some VOs had somewhat broken screenshots (like vo_xv taking screenshots with OSD in it). But all these issues are fixed now, so just get rid of the cruft.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf.c2
-rw-r--r--video/filter/vf_screenshot.c11
2 files changed, 0 insertions, 13 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 5b466031c7..719ec395fb 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -65,7 +65,6 @@ extern const vf_info_t vf_info_phase;
extern const vf_info_t vf_info_divtc;
extern const vf_info_t vf_info_softskip;
extern const vf_info_t vf_info_screenshot;
-extern const vf_info_t vf_info_screenshot_force;
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,7 +87,6 @@ static const vf_info_t *const filter_list[] = {
#endif
&vf_info_screenshot,
- &vf_info_screenshot_force,
&vf_info_noise,
&vf_info_eq,
diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c
index 8deb48924a..b28479963d 100644
--- a/video/filter/vf_screenshot.c
+++ b/video/filter/vf_screenshot.c
@@ -91,14 +91,3 @@ const vf_info_t vf_info_screenshot = {
vf_open,
NULL
};
-
-// screenshot.c will look for a filter named "screenshot_force", and not use
-// the VO based screenshot code if it's in the filter chain.
-const vf_info_t vf_info_screenshot_force = {
- "screenshot to file (override VO based screenshot code)",
- "screenshot_force",
- "A'rpi, Jindrich Makovicka",
- "",
- vf_open,
- NULL
-};