diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-22 16:12:34 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-22 16:12:34 +0000 |
| commit | 595850058503ce71c1604b4f29b57a36f8d79297 (patch) | |
| tree | fcaeb6043ed6181c5db97602dcf6571d021752ea /main | |
| parent | e977b3074a506363f1209838e96aa96bc09c995b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@166274 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/main/file.c b/main/file.c index 099f22953..4468d2276 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"); |