diff options
author | Russell Bryant <russell@russellbryant.com> | 2009-10-21 03:09:04 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2009-10-21 03:09:04 +0000 |
commit | cd10bd931a7f54a516255adc25cd5b6ab2f7a75a (patch) | |
tree | 583949f7994c4051ee5d88cca57247c7c23d99e5 /main/frame.c | |
parent | c5b8e9af7c82867c8d5f8b0a2a2dbb28ddbf27d4 (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@224932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/frame.c')
-rw-r--r-- | main/frame.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/main/frame.c b/main/frame.c index 1b8dead2a..f24c7a4dc 100644 --- a/main/frame.c +++ b/main/frame.c @@ -332,12 +332,6 @@ static void frame_cache_cleanup(void *data) static void __frame_free(struct ast_frame *fr, int cache) { - if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) { - ast_translate_frame_freed(fr); - } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) { - ast_dsp_frame_freed(fr); - } - if (!fr->mallocd) return; @@ -422,8 +416,6 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr) out->seqno = fr->seqno; } } else { - ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR); - ast_clear_flag(fr, AST_FRFLAG_FROM_DSP); out = fr; } |