diff options
| author | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
| commit | c26c190711a1bbe3b5fff1a93facae333757c56e (patch) | |
| tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /include/asterisk/image.h | |
| parent | 652fb64a01c7a8656697d07e606620ee0ced6929 (diff) | |
Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal. For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal
The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs. Functionally
no change in behavior should be present in this patch. Thanks to twilson
and russell for all the time they spent reviewing these changes.
Review: https://reviewboard.asterisk.org/r/1083/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/image.h')
| -rw-r--r-- | include/asterisk/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/image.h b/include/asterisk/image.h index a3e2e015e..302f09e85 100644 --- a/include/asterisk/image.h +++ b/include/asterisk/image.h @@ -28,7 +28,7 @@ struct ast_imager { char *name; /*!< Name */ char *desc; /*!< Description */ char *exts; /*!< Extension(s) (separated by '|' ) */ - int format; /*!< Image format */ + struct ast_format format; /*!< Image format */ struct ast_frame *(*read_image)(int fd, int len); /*!< Read an image from a file descriptor */ int (*identify)(int fd); /*!< Identify if this is that type of file */ int (*write_image)(int fd, struct ast_frame *frame); /*!< Returns length written */ @@ -57,12 +57,12 @@ int ast_send_image(struct ast_channel *chan, const char *filename); * \brief Make an image * \param filename filename of image to prepare * \param preflang preferred language to get the image...? - * \param format the format of the file + * \param format the format of the file, NULL for any image format * Make an image from a filename ??? No estoy positivo * \retval an ast_frame on success * \retval NULL on failure */ -struct ast_frame *ast_read_image(const char *filename, const char *preflang, int format); +struct ast_frame *ast_read_image(const char *filename, const char *preflang, struct ast_format *format); /*! * \brief Register image format |