aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/translate.h
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-21 03:17:44 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-21 03:17:44 +0000
commit3117c5065e539a057bca80e93273b2c08f7f76e1 (patch)
tree604f95bbe9df129a90da095ec3cef1ae897ca590 /include/asterisk/translate.h
parent992b0a00e5520978a8e2a204f06338477432edb9 (diff)
Merged revisions 224932 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r224932 | russell | 2009-10-20 22:09:04 -0500 (Tue, 20 Oct 2009) | 12 lines Merged revisions 224931 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r224931 | russell | 2009-10-20 21:59:54 -0500 (Tue, 20 Oct 2009) | 5 lines Isolate frames returned from a DSP instance or codec translator. The reasoning for these changes are the same as what I wrote in the commit message for rev 222878. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@224935 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/translate.h')
-rw-r--r--include/asterisk/translate.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index 01841ee01..0e0eae1ec 100644
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -151,7 +151,6 @@ struct ast_trans_pvt {
struct ast_trans_pvt *next; /*!< next in translator chain */
struct timeval nextin;
struct timeval nextout;
- unsigned int destroy:1;
};
/*! \brief generic frameout function */
@@ -257,20 +256,6 @@ unsigned int ast_translate_path_steps(unsigned int dest, unsigned int src);
*/
unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src);
-/*!
- * \brief Hint that a frame from a translator has been freed
- *
- * This is sort of a hack. This function gets called when ast_frame_free() gets
- * called on a frame that has the AST_FRFLAG_FROM_TRANSLATOR flag set. This is
- * because it is possible for a translation path to be destroyed while a frame
- * from a translator is still in use. Specifically, this happens if a masquerade
- * happens after a call to ast_read() but before the frame is done being processed,
- * since the frame processing is generally done without the channel lock held.
- *
- * \return nothing
- */
-void ast_translate_frame_freed(struct ast_frame *fr);
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif