diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 03:15:06 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 03:15:06 +0000 |
| commit | 7d497c4981be12129c4716d79c949150fdac127c (patch) | |
| tree | 1c8e12327b766634e5ee02998e5169e33a7d809d /main/frame.c | |
| parent | 130bfa65a52b87d20852ec761b6224192abb586f (diff) | |
Merged revisions 224932 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r224932 | russell | 2009-10-20 22:09:04 -0500 (Tue, 20 Oct 2009) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@224933 f38db490-d61c-443f-a65b-d21fe96a405b
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 a3795bd70..a1696d4d4 100644 --- a/main/frame.c +++ b/main/frame.c @@ -330,12 +330,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; @@ -420,8 +414,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; } |