kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

When merging the fix for issue #14118, I found that

Browse Source 
the issue didn't affect 1.6.0, but in this case that's
not an especially good thing, because it means that
the fix for issue #13496 was not merged into 1.6.0 in
the first place. This commit kills two birds with one
stone by putting both fixes in the 1.6.0 branch



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-12-22 16:30:25 +00:00
parent b19363ed78
commit 2e8b3deab5
4 changed files with 109 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/frame.c
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;