summaryrefslogtreecommitdiffstats
path: root/command.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-11-25 23:59:23 +0200
committerUoti Urpala <uau@mplayer2.org>2011-11-25 23:59:23 +0200
commit8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf (patch)
tree60e7fca2028093bf454f0d62bd96b40c3e4ab7a4 /command.c
parent9fae75b81ce2eb475db7652083b388e704833a72 (diff)
parent3215ec05fe27b1e07c863aadf4402c5bd6dbec33 (diff)
downloadmpv-8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf.tar.bz2
mpv-8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf.tar.xz
Merge branch 'screenshot' (early part)
Diffstat (limited to 'command.c')
-rw-r--r--command.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/command.c b/command.c
index d5ab987baf..45f778a96c 100644
--- a/command.c
+++ b/command.c
@@ -66,6 +66,7 @@
#endif
#include "stream/stream_dvdnav.h"
#include "m_struct.h"
+#include "screenshot.h"
#include "mp_core.h"
#include "mp_fifo.h"
@@ -3380,15 +3381,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
break;
case MP_CMD_SCREENSHOT:
- if (mpctx->video_out && mpctx->video_out->config_ok) {
- mp_msg(MSGT_CPLAYER, MSGL_INFO, "sending VFCTRL_SCREENSHOT!\n");
- if (CONTROL_OK !=
- ((vf_instance_t *) sh_video->vfilter)->
- control(sh_video->vfilter, VFCTRL_SCREENSHOT,
- &cmd->args[0].v.i))
- mp_msg(MSGT_CPLAYER, MSGL_INFO,
- "failed (forgot -vf screenshot?)\n");
- }
+ screenshot_request(mpctx, cmd->args[0].v.i, cmd->args[1].v.i);
break;
case MP_CMD_VF_CHANGE_RECTANGLE: