diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-07-21 18:26:39 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-21 18:26:39 -0500 |
| commit | 0b8448a74be219b98e55b9128c939f8f51859c3b (patch) | |
| tree | 19d1a2b65e7e3c609e88cf432f73e84c82f6e354 /include | |
| parent | efebb1b9e0c36690b890a891d2735ee84867a522 (diff) | |
| parent | 676aeede3643dbe9b79fd7117ce7e335f236d151 (diff) | |
Merge changes from topic 'ASTERISK-26214' into 13
* changes:
res_fax: Fix FAXOPT(faxdetect) timeout option.
chan_dahdi: Add faxdetect_timeout option.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_fax.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/res_fax.h b/include/asterisk/res_fax.h index 2304da734..5119bfa6c 100644 --- a/include/asterisk/res_fax.h +++ b/include/asterisk/res_fax.h @@ -179,11 +179,11 @@ struct ast_fax_session_details { unsigned int t38timeout; /*! the id of the t.38 gateway framehook for this channel */ int gateway_id; - /*! the timeout for this gateway in seconds */ + /*! The timeout for this gateway in ms */ int gateway_timeout; /*! the id of the faxdetect framehook for this channel */ int faxdetect_id; - /*! The timeout for this fax detect in seconds */ + /*! The timeout for this fax detect in ms */ int faxdetect_timeout; /*! flags used for fax detection */ int faxdetect_flags; |