Merge branch 'master' into remove_old_demuxers

Conflicts:
	DOCS/man/en/changes.rst
	DOCS/man/en/options.rst

1 files changed, 6 insertions, 0 deletions

diff --git a/core/screenshot.h b/core/screenshot.h
index 916a875505..1b12ac9b73 100644
--- a/core/screenshot.h
+++ b/core/screenshot.h
@@ -34,6 +34,12 @@ void screenshot_init(struct MPContext *mpctx);
 void screenshot_request(struct MPContext *mpctx, int mode, bool each_frame,
                         bool osd);
 
+// filename: where to store the screenshot; doesn't try to find an alternate
+//           name if the file already exists
+// mode, osd: same as in screenshot_request()
+void screenshot_to_file(struct MPContext *mpctx, const char *filename, int mode,
+                        bool osd);
+
 // Called by the playback core code when a new frame is displayed.
 void screenshot_flip(struct MPContext *mpctx);