diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-20 18:20:00 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-20 18:20:00 +0000 |
| commit | 55c8679f51690318192edb896a185580ebe3e151 (patch) | |
| tree | 1b68a516fb0d29900e9900fa7595afe60f039507 /main/frame.c | |
| parent | 309fa3bb3aabd08b1a42796a60f2e52dc11aee80 (diff) | |
Merged revisions 158072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r158072 | twilson | 2008-11-20 11:48:58 -0600 (Thu, 20 Nov 2008) | 2 lines
Begin on a crusade to end trailing whitespace!
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@158133 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/frame.c')
| -rw-r--r-- | main/frame.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/frame.c b/main/frame.c index c468a3703..35bb47fff 100644 --- a/main/frame.c +++ b/main/frame.c @@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/linkedlists.h" #include "asterisk/translate.h" #include "asterisk/dsp.h" +#include "asterisk/file.h" #ifdef TRACE_FRAMES static int headers; @@ -307,10 +308,13 @@ static void frame_cache_cleanup(void *data) void ast_frame_free(struct ast_frame *fr, int cache) { - if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) + if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) { ast_translate_frame_freed(fr); - else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) + } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) { ast_dsp_frame_freed(fr); + } else if (ast_test_flag(fr, AST_FRFLAG_FROM_FILESTREAM)) { + ast_filestream_frame_freed(fr); + } if (!fr->mallocd) return; |