diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /sub/dec_sub.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/dec_sub.h')
| -rw-r--r-- | sub/dec_sub.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 341966a430..26781fd99f 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -9,6 +9,7 @@ struct sh_stream; struct mpv_global; struct demux_packet; +struct mp_recorder_sink; struct dec_sub; struct sd; @@ -16,7 +17,6 @@ struct sd; enum sd_ctrl { SD_CTRL_SUB_STEP, SD_CTRL_SET_VIDEO_PARAMS, - SD_CTRL_GET_RESOLUTION, SD_CTRL_SET_TOP, SD_CTRL_SET_VIDEO_DEF_FPS, SD_CTRL_UPDATE_SPEED, @@ -41,6 +41,7 @@ void sub_get_bitmaps(struct dec_sub *sub, struct mp_osd_res dim, int format, char *sub_get_text(struct dec_sub *sub, double pts); void sub_reset(struct dec_sub *sub); void sub_select(struct dec_sub *sub, bool selected); +void sub_set_recorder_sink(struct dec_sub *sub, struct mp_recorder_sink *sink); int sub_control(struct dec_sub *sub, enum sd_ctrl cmd, void *arg); |