Merged revisions 302412 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302412 | seanbright | 2011-01-19 10:31:39 -0500 (Wed, 19 Jan 2011) | 10 lines

  Use appropriate type for requested format in chan_local.

  We were passing and storing the requested format as an int instead of format_t
  resulting in truncation.

  (closes issue #18238)
  Reported by: whizemen
  Patches:
        0018238_speex16.patch uploaded by whizemen (license 1143)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302413 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_local.c b/channels/chan_local.c
index f224140..e80722c 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -141,7 +141,7 @@ struct local_pvt {
        unsigned int flags;                     /*!< Private flags */
        char context[AST_MAX_CONTEXT];          /*!< Context to call */
        char exten[AST_MAX_EXTENSION];          /*!< Extension to call */
-       int reqformat;                          /*!< Requested format */
+       format_t reqformat;                             /*!< Requested format */
        struct ast_jb_conf jb_conf;             /*!< jitterbuffer configuration for this local channel */
        struct ast_channel *owner;              /*!< Master Channel - Bridging happens here */
        struct ast_channel *chan;               /*!< Outbound channel - PBX is run here */
@@ -955,7 +955,7 @@ static int local_hangup(struct ast_channel *ast)
 }
 
 /*! \brief Create a call structure */
-static struct local_pvt *local_alloc(const char *data, int format)
+static struct local_pvt *local_alloc(const char *data, format_t format)
 {
        struct local_pvt *tmp = NULL;
        char *c = NULL, *opts = NULL;