From c01f7c0af87c8a045f1f961740603cf0d9ffc3c7 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 22 Dec 2008 16:12:34 +0000 Subject: [PATCH] Back these changes out for now. The initial refcounting for filestreams didn't get merged into 1.6.0. I'll have to get that in first and then put this change in git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166274 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/main/file.c b/main/file.c index 099f229537..4468d22761 100644 --- a/main/file.c +++ b/main/file.c @@ -659,10 +659,6 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) goto return_failure; fr = s->fmt->read(s, &whennext); - if (fr) { - ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); - ao2_ref(s, +1); - } if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) ast_log(LOG_WARNING, "Failed to write frame\n"); @@ -719,10 +715,6 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) while (!whennext) { struct ast_frame *fr = s->fmt->read(s, &whennext); - if (fr) { - ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); - ao2_ref(s, +1); - } if (!fr || ast_write(s->owner, fr)) { /* no stream or error, as above */ if (fr) ast_log(LOG_WARNING, "Failed to write frame\n");