From 3a9c27459eed77111a472154388c73c90b509153 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 20 Nov 2008 18:20:00 +0000 Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@158133 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/frame.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main/frame.c') 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; -- cgit v1.2.3