Merge branch 'master' into remove_old_demuxers

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

1 files changed, 10 insertions, 0 deletions

diff --git a/core/command.c b/core/command.c
index fb21d7bc41..5a68a228bc 100644
--- a/core/command.c
+++ b/core/command.c
@@ -2420,6 +2420,10 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
         screenshot_request(mpctx, cmd->args[0].v.i, cmd->args[1].v.i, msg_osd);
         break;
 
+    case MP_CMD_SCREENSHOT_TO_FILE:
+        screenshot_to_file(mpctx, cmd->args[0].v.s, cmd->args[1].v.i, msg_osd);
+        break;
+
     case MP_CMD_RUN:
 #ifndef __MINGW32__
         if (!fork()) {
@@ -2507,6 +2511,12 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
         change_video_filters(mpctx, cmd->args[0].v.s, cmd->args[1].v.s);
         break;
 
+    case MP_CMD_COMMAND_LIST: {
+        for (struct mp_cmd *sub = cmd->args[0].v.p; sub; sub = sub->queue_next)
+            run_command(mpctx, sub);
+        break;
+    }
+
     default:
         mp_msg(MSGT_CPLAYER, MSGL_V,
                "Received unknown cmd %s\n", cmd->name);