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
This commit is contained in:
Mark Michelson
2008-11-20 18:20:00 +00:00
parent 2d4e3b21ee
commit 3a9c27459e
5 changed files with 112 additions and 46 deletions

View File

@@ -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;