diff options
| author | Idan Freiberg <speidy@gmail.com> | 2014-07-23 16:44:59 +0300 |
|---|---|---|
| committer | Idan Freiberg <speidy@gmail.com> | 2014-07-23 16:44:59 +0300 |
| commit | 16929efb059e1e29c826388e5d57be82014d241b (patch) | |
| tree | f8661e7495a82a4a73e68825f1a1ff44a9e100f1 /xrdp/xrdp_types.h | |
| parent | 0795400fe260652f6ae3788325e2a4c8ee05fe3a (diff) | |
| parent | 0c63a8feb3c52de98a5da51a0a0f743450c34645 (diff) | |
| download | xrdp-proprietary-16929efb059e1e29c826388e5d57be82014d241b.tar.gz xrdp-proprietary-16929efb059e1e29c826388e5d57be82014d241b.zip | |
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into
devel
Conflicts:
libxrdp/xrdp_sec.c
Diffstat (limited to 'xrdp/xrdp_types.h')
| -rw-r--r-- | xrdp/xrdp_types.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 0e31dd59..89a7ce93 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -268,6 +268,9 @@ struct xrdp_cache struct list* xrdp_os_del_list; }; +/* defined later */ +struct xrdp_enc_data; + struct xrdp_mm { struct xrdp_wm* wm; /* owner */ @@ -300,6 +303,8 @@ struct xrdp_mm FIFO *fifo_to_proc; FIFO *fifo_processed; tbus mutex; + int (*process_enc)(struct xrdp_mm *self, struct xrdp_enc_data *enc); + void *codec_handle; }; struct xrdp_key_info @@ -641,7 +646,10 @@ struct xrdp_enc_data_done char *comp_pad_data; struct xrdp_enc_data *enc; int last; /* true is this is last message for enc */ - int index; /* depends on codec */ + int x; + int y; + int cx; + int cy; }; typedef struct xrdp_enc_data_done XRDP_ENC_DATA_DONE; |